diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-21 14:03:47 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-25 10:48:59 -0700 |
| commit | c6e4e27566a38ac56f3c5a38f19714fc361f5ede (patch) | |
| tree | 75cc299dc906c36ca9a735c450d4ec383c1b1f72 /lib/mail_handler/backends/mail_extensions.rb | |
| parent | 3d7a1ca113221d30f47d001ee97bd734c841988e (diff) | |
Handle the case where an encoding is extracted that iconv doesn't handle.
Diffstat (limited to 'lib/mail_handler/backends/mail_extensions.rb')
| -rw-r--r-- | lib/mail_handler/backends/mail_extensions.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/mail_handler/backends/mail_extensions.rb b/lib/mail_handler/backends/mail_extensions.rb index 322c49bb5..6d6a20f8c 100644 --- a/lib/mail_handler/backends/mail_extensions.rb +++ b/lib/mail_handler/backends/mail_extensions.rb @@ -78,7 +78,10 @@ module Mail # invalid character at the end of the string, even # with UTF-8//IGNORE: # http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/ - str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str + " ")[0...-4] + begin + str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str + " ")[0...-4] + rescue Iconv::InvalidEncoding + end end str end |