From 481d579734ac077f69fcd2db69c3dffdfd6f260a Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Mon, 6 Jun 2005 16:12:38 +0000
Subject: Don't error while processing encoded attachment names #1340
 [lon@speedymac.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1390 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionmailer/lib/action_mailer/vendor/tmail/utils.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionmailer/lib')

diff --git a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb b/actionmailer/lib/action_mailer/vendor/tmail/utils.rb
index 57df234464..57919473f1 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail/utils.rb
@@ -206,8 +206,12 @@ module TMail
 
     def decode_RFC2231( str )
       m = RFC2231_ENCODED.match(str) or return str
-      NKF.nkf(NKF_FLAGS[$KCODE],
-              m.post_match.gsub(/%[\da-f]{2}/in) {|s| s[1,2].hex.chr })
+      begin
+        NKF.nkf(NKF_FLAGS[$KCODE],
+        m.post_match.gsub(/%[\da-f]{2}/in) {|s| s[1,2].hex.chr })
+      rescue
+        m.post_match.gsub(/%[\da-f]{2}/in, "")
+      end
     end
 
   end
-- 
cgit v1.2.3