easy_decode now also catches InvalidCharacter

diff --git a/lib/sup/rfc2047.rb b/lib/sup/rfc2047.rb
index fcd5cf071262565ef0594ac736b5c758d44710d5..f31faa1f9b6fb9483ba9f24ac1eb3f6fd9f369b9 100644 (file)
--- a/lib/sup/rfc2047.rb
+++ b/lib/sup/rfc2047.rb
@@ -52,11 +52,7 @@ module Rfc2047
         # WORD.
       end
 
-      begin
-        Iconv.easy_decode(target, charset, text)
-      rescue Iconv::InvalidCharacter
-        text
-      end
+      Iconv.easy_decode(target, charset, text)
     end
   end
 end

diff --git a/lib/sup/util.rb b/lib/sup/util.rb
index 8f60cc43216979aaa207696324f117ba7025cbdd..d76d2a39571adeb17fdc66ef9b807577070ddf5c 100644 (file)
--- a/lib/sup/util.rb
+++ b/lib/sup/util.rb
@@ -651,7 +651,7 @@ class Iconv
 
     begin
       Iconv.iconv(target + "//IGNORE", charset, text + " ").join[0 .. -2]
-    rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence => e
+    rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::InvalidCharacter, Iconv::IllegalSequence => e
       Redwood::log "warning: error (#{e.class.name}) decoding text from #{charset} to #{target}: #{text[0 ... 20]}"
       text
     end