mail 2.7.0.rc1 → 2.7.0.rc2

data/lib/mail/parsers/address_lists_parser.rl

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 require 'mail/utilities'
+require 'mail/parser_tools'
 
 %%{
   machine address_lists;
+  alphtype int;
 
   # Phrase
   action phrase_s { phrase_s = p }
@@ -10,13 +12,13 @@ require 'mail/utilities'
 
   # Quoted String.
   action qstr_s { qstr_s = p }
-  action qstr_e { qstr = data[qstr_s..(p-1)] }
+  action qstr_e { qstr = chars(data, qstr_s, p-1) }
 
   # Comment
   action comment_s { comment_s = p unless comment_s }
   action comment_e {
     if address
-      address.comments << data[comment_s..(p-2)]
+      address.comments << chars(data, comment_s, p-2)
     end
     comment_s = nil
   }
@@ -28,7 +30,7 @@ require 'mail/utilities'
       group = qstr
       qstr = nil
     else
-      group = data[group_name_s..(p-1)]
+      group = chars(data, group_name_s, p-1)
       group_name_s = nil
     end
     address_list.group_names << group
@@ -42,18 +44,18 @@ require 'mail/utilities'
 
   # Address
   action address_s { address_s = p }
+
+  # Ignore address end events without a start event.
   action address_e {
-    # Ignore address end events if they don't have
-    # a matching address start event.
     if address_s
       if address.local.nil? && local_dot_atom_pre_comment_e && local_dot_atom_s && local_dot_atom_e
         if address.domain
-          address.local = data[local_dot_atom_s..local_dot_atom_e] if address
+          address.local = chars(data, local_dot_atom_s, local_dot_atom_e)
         else
-          address.local = data[local_dot_atom_s..local_dot_atom_pre_comment_e] if address
+          address.local = chars(data, local_dot_atom_s, local_dot_atom_pre_comment_e)
         end
       end
-      address.raw = data[address_s..(p-1)]
+      address.raw = chars(data, address_s, p-1)
       address_list.addresses << address if address
 
       # Start next address
@@ -71,7 +73,7 @@ require 'mail/utilities'
       address.display_name = Mail::Utilities.unescape(qstr)
       qstr = nil
     elsif phrase_e
-      address.display_name = data[phrase_s..phrase_e].strip
+      address.display_name = chars(data, phrase_s, phrase_e).strip
       phrase_e = phrase_s = nil
     end
   }
@@ -79,7 +81,7 @@ require 'mail/utilities'
   # Domain
   action domain_s { domain_s = p }
   action domain_e {
-    address.domain = data[domain_s..(p-1)].rstrip if address
+    address.domain = chars(data, domain_s, p-1).rstrip if address
   }
 
   # Local
@@ -90,7 +92,7 @@ require 'mail/utilities'
 
   # obs_domain_list
   action obs_domain_list_s { obs_domain_list_s = p }
-  action obs_domain_list_e { address.obs_domain_list = data[obs_domain_list_s..(p-1)] }
+  action obs_domain_list_e { address.obs_domain_list = chars(data, obs_domain_list_s, p-1) }
 
   # Junk actions
   action addr_spec { }
@@ -129,6 +131,8 @@ require 'mail/utilities'
 
 module Mail::Parsers
   module AddressListsParser
+    extend Mail::ParserTools
+
     AddressListStruct = Struct.new(:addresses, :group_names, :error)
     AddressStruct = Struct.new(:raw, :domain, :comments, :local,
                              :obs_domain_list, :display_name, :group, :error)
@@ -136,6 +140,8 @@ module Mail::Parsers
     %%write data noprefix;
 
     def self.parse(data)
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+
       address_list = AddressListStruct.new([], [])
       return address_list if Mail::Utilities.blank?(data)
 
@@ -157,7 +163,7 @@ module Mail::Parsers
       %%write exec;
 
       if p != eof || cs < %%{ write first_final; }%%
-        raise Mail::Field::ParseError.new(Mail::AddressList, data, "Only able to parse up to #{data[0..p]}")
+        raise Mail::Field::IncompleteParseError.new(Mail::AddressList, data, p)
       end
 
       address_list

data/lib/mail/parsers/content_disposition_parser.rb

@@ -1,12 +1,15 @@
 
 # frozen_string_literal: true
 require 'mail/utilities'
+require 'mail/parser_tools'
 
 
 
 
 module Mail::Parsers
   module ContentDispositionParser
+    extend Mail::ParserTools
+
     ContentDispositionStruct = Struct.new(:disposition_type, :parameters, :error)
 
     
@@ -18,16 +21,21 @@ self._trans_keys = [
 	0, 0, 33, 126, 9, 126, 
 	10, 10, 9, 32, 33, 
 	126, 9, 126, 9, 40, 
-	10, 10, 9, 32, 1, 127, 
-	1, 127, 10, 10, 9, 
+	10, 10, 9, 32, 1, 244, 
+	1, 244, 10, 10, 9, 
 	32, 10, 10, 9, 32, 
-	-128, -1, 9, 40, 10, 10, 
-	9, 32, 9, 126, 1, 
-	127, 1, 127, 10, 10, 
-	9, 32, -128, -1, 33, 126, 
-	9, 59, 9, 59, 9, 
-	126, 9, 59, 9, 59, 
-	0, 0, 0
+	0, 244, 128, 191, 160, 191, 
+	128, 191, 128, 159, 144, 
+	191, 128, 191, 128, 143, 
+	9, 40, 10, 10, 9, 32, 
+	9, 126, 1, 244, 1, 
+	244, 10, 10, 9, 32, 
+	0, 244, 128, 191, 160, 191, 
+	128, 191, 128, 159, 144, 
+	191, 128, 191, 128, 143, 
+	33, 126, 9, 59, 9, 59, 
+	9, 126, 9, 59, 9, 
+	59, 0, 0, 0
 ]
 
 class << self
@@ -36,10 +44,11 @@ class << self
 end
 self._key_spans = [
 	0, 94, 118, 1, 24, 94, 118, 32, 
-	1, 24, 127, 127, 1, 24, 1, 24, 
-	128, 32, 1, 24, 118, 127, 127, 1, 
-	24, 128, 94, 51, 51, 118, 51, 51, 
-	0
+	1, 24, 244, 244, 1, 24, 1, 24, 
+	245, 64, 32, 64, 32, 48, 64, 16, 
+	32, 1, 24, 118, 244, 244, 1, 24, 
+	245, 64, 32, 64, 32, 48, 64, 16, 
+	94, 51, 51, 118, 51, 51, 0
 ]
 
 class << self
@@ -48,10 +57,11 @@ class << self
 end
 self._index_offsets = [
 	0, 0, 95, 214, 216, 241, 336, 455, 
-	488, 490, 515, 643, 771, 773, 798, 800, 
-	825, 954, 987, 989, 1014, 1133, 1261, 1389, 
-	1391, 1416, 1545, 1640, 1692, 1744, 1863, 1915, 
-	1967
+	488, 490, 515, 760, 1005, 1007, 1032, 1034, 
+	1059, 1305, 1370, 1403, 1468, 1501, 1550, 1615, 
+	1632, 1665, 1667, 1692, 1811, 2056, 2301, 2303, 
+	2328, 2574, 2639, 2672, 2737, 2770, 2819, 2884, 
+	2901, 2996, 3048, 3100, 3219, 3271, 3323
 ]
 
 class << self
@@ -139,173 +149,342 @@ self._indicies = [
 	19, 19, 19, 19, 19, 19, 19, 19, 
 	19, 19, 19, 19, 19, 19, 19, 19, 
 	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 1, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 1, 23, 23, 24, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 25, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 26, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 23, 23, 23, 23, 23, 23, 
-	23, 23, 1, 27, 1, 23, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 23, 1, 28, 1, 
-	29, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 29, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 23, 30, 1, 1, 1, 31, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
+	19, 19, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 30, 1, 32, 1, 1, 1, 1, 
-	1, 33, 1, 34, 1, 35, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 35, 1, 36, 1, 
-	1, 1, 37, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 36, 38, 38, 
-	38, 38, 38, 38, 38, 39, 1, 38, 
-	38, 38, 38, 38, 1, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 1, 
-	1, 1, 1, 1, 1, 1, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	1, 1, 1, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 1, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 1, 40, 
-	40, 41, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 42, 43, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	44, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 1, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 1, 45, 
-	45, 46, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 47, 48, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	49, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 1, 50, 1, 45, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 45, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 24, 25, 25, 25, 25, 25, 
+	25, 25, 25, 25, 25, 25, 25, 26, 
+	25, 25, 27, 28, 28, 28, 29, 1, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 1, 30, 30, 31, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 32, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 33, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 35, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 37, 36, 36, 38, 
+	39, 39, 39, 40, 1, 41, 1, 30, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 30, 1, 
+	42, 1, 43, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 43, 1, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 35, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	37, 36, 36, 38, 39, 39, 39, 40, 
+	1, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 30, 
+	30, 1, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 1, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 1, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 34, 34, 34, 34, 
+	34, 34, 34, 34, 1, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 1, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 1, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 1, 
+	44, 1, 1, 1, 45, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 44, 
+	1, 46, 1, 1, 1, 1, 1, 47, 
+	1, 48, 1, 49, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 49, 1, 50, 1, 1, 1, 
+	51, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 50, 52, 52, 52, 52, 
+	52, 52, 52, 53, 1, 52, 52, 52, 
+	52, 52, 1, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 1, 1, 1, 
+	1, 1, 1, 1, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 1, 1, 
+	1, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 1, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 1, 54, 54, 55, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 56, 57, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 58, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 54, 54, 54, 54, 54, 54, 
+	54, 54, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 59, 59, 59, 59, 
+	59, 59, 59, 59, 59, 59, 59, 59, 
+	59, 59, 59, 59, 59, 59, 59, 59, 
+	59, 59, 59, 59, 59, 59, 59, 59, 
+	59, 59, 60, 61, 61, 61, 61, 61, 
+	61, 61, 61, 61, 61, 61, 61, 62, 
+	61, 61, 63, 64, 64, 64, 65, 1, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 1, 66, 66, 67, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 68, 
+	69, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 70, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 72, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 74, 73, 73, 75, 
+	76, 76, 76, 77, 1, 78, 1, 66, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	45, 51, 51, 51, 51, 51, 51, 51, 
-	1, 1, 51, 51, 51, 51, 51, 1, 
-	51, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 1, 52, 1, 1, 1, 1, 
-	1, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 51, 1, 1, 1, 51, 51, 
-	51, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 51, 51, 51, 51, 51, 51, 
-	51, 51, 51, 51, 51, 51, 51, 1, 
-	53, 1, 1, 1, 54, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 53, 
-	1, 1, 1, 1, 1, 1, 1, 55, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 56, 1, 57, 1, 1, 1, 
-	58, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 57, 1, 1, 1, 1, 
-	1, 1, 1, 59, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 60, 1, 
-	61, 1, 1, 1, 62, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 61, 
-	63, 1, 63, 63, 63, 63, 63, 64, 
-	1, 63, 63, 63, 63, 63, 1, 63, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 1, 56, 1, 63, 1, 1, 1, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 63, 1, 1, 1, 63, 63, 63, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 63, 63, 63, 63, 63, 1, 35, 
-	1, 1, 1, 65, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 35, 1, 
 	1, 1, 1, 1, 1, 1, 66, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 2, 1, 67, 1, 1, 1, 68, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 67, 1, 1, 1, 1, 1, 
-	1, 1, 69, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 36, 1, 1, 
-	0
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	72, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 74, 73, 73, 
+	75, 76, 76, 76, 77, 1, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 66, 66, 
+	66, 66, 66, 66, 66, 66, 1, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 1, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	1, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 71, 71, 71, 71, 71, 
+	71, 1, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 1, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 1, 73, 73, 73, 73, 
+	73, 73, 73, 73, 73, 73, 73, 73, 
+	73, 73, 73, 73, 1, 79, 79, 79, 
+	79, 79, 79, 79, 1, 1, 79, 79, 
+	79, 79, 79, 1, 79, 79, 79, 79, 
+	79, 79, 79, 79, 79, 79, 1, 80, 
+	1, 1, 1, 1, 1, 79, 79, 79, 
+	79, 79, 79, 79, 79, 79, 79, 79, 
+	79, 79, 79, 79, 79, 79, 79, 79, 
+	79, 79, 79, 79, 79, 79, 79, 1, 
+	1, 1, 79, 79, 79, 79, 79, 79, 
+	79, 79, 79, 79, 79, 79, 79, 79, 
+	79, 79, 79, 79, 79, 79, 79, 79, 
+	79, 79, 79, 79, 79, 79, 79, 79, 
+	79, 79, 79, 1, 81, 1, 1, 1, 
+	82, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 81, 1, 1, 1, 1, 
+	1, 1, 1, 83, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 84, 1, 
+	85, 1, 1, 1, 86, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 85, 
+	1, 1, 1, 1, 1, 1, 1, 87, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 88, 1, 89, 1, 1, 1, 
+	90, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 89, 91, 1, 91, 91, 
+	91, 91, 91, 92, 1, 91, 91, 91, 
+	91, 91, 1, 91, 91, 91, 91, 91, 
+	91, 91, 91, 91, 91, 1, 84, 1, 
+	91, 1, 1, 1, 91, 91, 91, 91, 
+	91, 91, 91, 91, 91, 91, 91, 91, 
+	91, 91, 91, 91, 91, 91, 91, 91, 
+	91, 91, 91, 91, 91, 91, 1, 1, 
+	1, 91, 91, 91, 91, 91, 91, 91, 
+	91, 91, 91, 91, 91, 91, 91, 91, 
+	91, 91, 91, 91, 91, 91, 91, 91, 
+	91, 91, 91, 91, 91, 91, 91, 91, 
+	91, 91, 1, 49, 1, 1, 1, 93, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 49, 1, 1, 1, 1, 1, 
+	1, 1, 94, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 2, 1, 95, 
+	1, 1, 1, 96, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 95, 1, 
+	1, 1, 1, 1, 1, 1, 97, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 50, 1, 1, 0
 ]
 
 class << self
@@ -313,15 +492,19 @@ class << self
 	private :_trans_targs, :_trans_targs=
 end
 self._trans_targs = [
-	26, 0, 2, 3, 5, 20, 4, 5, 
-	6, 7, 8, 29, 10, 17, 7, 8, 
-	10, 17, 9, 11, 12, 27, 16, 11, 
-	12, 27, 16, 13, 15, 27, 7, 8, 
-	10, 17, 19, 30, 2, 3, 5, 20, 
-	22, 23, 22, 32, 25, 22, 23, 22, 
-	32, 25, 24, 26, 2, 27, 14, 28, 
-	2, 27, 14, 28, 2, 30, 18, 29, 
-	31, 18, 31, 30, 18, 31
+	40, 0, 2, 3, 5, 27, 4, 5, 
+	6, 7, 8, 43, 10, 24, 7, 8, 
+	10, 24, 9, 11, 12, 41, 16, 17, 
+	18, 19, 20, 21, 22, 23, 11, 12, 
+	41, 16, 17, 18, 19, 20, 21, 22, 
+	23, 13, 15, 41, 7, 8, 10, 24, 
+	26, 44, 2, 3, 5, 27, 29, 30, 
+	29, 46, 32, 33, 34, 35, 36, 37, 
+	38, 39, 29, 30, 29, 46, 32, 33, 
+	34, 35, 36, 37, 38, 39, 31, 40, 
+	2, 41, 14, 42, 2, 41, 14, 42, 
+	2, 44, 25, 43, 45, 25, 45, 44, 
+	25, 45
 ]
 
 class << self
@@ -331,13 +514,17 @@ end
 self._trans_actions = [
 	1, 0, 0, 0, 2, 3, 0, 0, 
 	4, 5, 5, 5, 5, 6, 0, 0, 
-	0, 3, 0, 7, 7, 8, 7, 0, 
-	0, 9, 0, 0, 0, 0, 10, 10, 
-	10, 11, 0, 0, 10, 10, 12, 11, 
-	13, 13, 14, 15, 13, 0, 0, 3, 
-	16, 0, 0, 0, 17, 18, 18, 19, 
-	18, 20, 20, 21, 20, 18, 18, 0, 
-	22, 0, 3, 10, 10, 11
+	0, 3, 0, 7, 7, 8, 7, 7, 
+	7, 7, 7, 7, 7, 7, 0, 0, 
+	9, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 10, 10, 10, 11, 
+	0, 0, 10, 10, 12, 11, 13, 13, 
+	14, 15, 13, 13, 13, 13, 13, 13, 
+	13, 13, 0, 0, 3, 16, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	17, 18, 18, 19, 18, 20, 20, 21, 
+	20, 18, 18, 0, 22, 0, 3, 10, 
+	10, 11
 ]
 
 class << self
@@ -348,8 +535,9 @@ self._eof_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 17, 18, 20, 18, 0, 10, 
-	0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	17, 18, 20, 18, 0, 10, 0
 ]
 
 class << self
@@ -359,7 +547,7 @@ self.start = 1;
 class << self
 	attr_accessor :first_final
 end
-self.first_final = 26;
+self.first_final = 40;
 class << self
 	attr_accessor :error
 end
@@ -368,7 +556,7 @@ self.error = 0;
 class << self
 	attr_accessor :en_comment_tail
 end
-self.en_comment_tail = 21;
+self.en_comment_tail = 28;
 class << self
 	attr_accessor :en_main
 end
@@ -377,6 +565,8 @@ self.en_main = 1;
 
 
     def self.parse(data)
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+
       content_disposition = ContentDispositionStruct.new('', [])
       return content_disposition if Mail::Utilities.blank?(data)
 
@@ -438,19 +628,19 @@ begin
  disp_type_s = p 		end
 	when 17 then
 		begin
- content_disposition.disposition_type = data[disp_type_s..(p-1)].downcase 		end
+ content_disposition.disposition_type = chars(data, disp_type_s, p-1).downcase 		end
 	when 2 then
 		begin
  param_attr_s = p 		end
 	when 4 then
 		begin
- param_attr = data[param_attr_s..(p-1)] 		end
+ param_attr = chars(data, param_attr_s, p-1) 		end
 	when 7 then
 		begin
  qstr_s = p 		end
 	when 9 then
 		begin
- qstr = data[qstr_s..(p-1)] 		end
+ qstr = chars(data, qstr_s, p-1) 		end
 	when 5 then
 		begin
  param_val_s = p 		end
@@ -462,7 +652,7 @@ begin
     end
 
     # Use quoted string value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_disposition.parameters << { param_attr => value }
     param_attr = nil
@@ -479,7 +669,7 @@ begin
  	begin
 		stack[top] = cs
 		top+= 1
-		cs = 21
+		cs = 28
 		_goto_level = _again
 		next
 	end
@@ -497,7 +687,7 @@ begin
 		begin
  qstr_s = p 		end
 		begin
- qstr = data[qstr_s..(p-1)] 		end
+ qstr = chars(data, qstr_s, p-1) 		end
 	when 6 then
 		begin
  param_val_s = p 		end
@@ -505,7 +695,7 @@ begin
  	begin
 		stack[top] = cs
 		top+= 1
-		cs = 21
+		cs = 28
 		_goto_level = _again
 		next
 	end
@@ -518,7 +708,7 @@ begin
     end
 
     # Use quoted string value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_disposition.parameters << { param_attr => value }
     param_attr = nil
@@ -528,7 +718,7 @@ begin
  	begin
 		stack[top] = cs
 		top+= 1
-		cs = 21
+		cs = 28
 		_goto_level = _again
 		next
 	end
@@ -548,7 +738,7 @@ begin
     end
 
     # Use quoted string value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_disposition.parameters << { param_attr => value }
     param_attr = nil
@@ -561,7 +751,7 @@ begin
  	begin
 		stack[top] = cs
 		top+= 1
-		cs = 21
+		cs = 28
 		_goto_level = _again
 		next
 	end
@@ -573,7 +763,7 @@ begin
  	begin
 		stack[top] = cs
 		top+= 1
-		cs = 21
+		cs = 28
 		_goto_level = _again
 		next
 	end
@@ -594,7 +784,7 @@ begin
  	begin
 		stack[top] = cs
 		top+= 1
-		cs = 21
+		cs = 28
 		_goto_level = _again
 		next
 	end
@@ -606,7 +796,7 @@ begin
     end
 
     # Use quoted string value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_disposition.parameters << { param_attr => value }
     param_attr = nil
@@ -619,7 +809,7 @@ begin
  	begin
 		stack[top] = cs
 		top+= 1
-		cs = 21
+		cs = 28
 		_goto_level = _again
 		next
 	end
@@ -631,7 +821,7 @@ begin
     end
 
     # Use quoted string value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_disposition.parameters << { param_attr => value }
     param_attr = nil
@@ -656,7 +846,7 @@ begin
 	  case _eof_actions[cs]
 	when 17 then
 		begin
- content_disposition.disposition_type = data[disp_type_s..(p-1)].downcase 		end
+ content_disposition.disposition_type = chars(data, disp_type_s, p-1).downcase 		end
 	when 18 then
 		begin
 
@@ -665,7 +855,7 @@ begin
     end
 
     # Use quoted string value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_disposition.parameters << { param_attr => value }
     param_attr = nil
@@ -684,7 +874,7 @@ begin
     end
 
     # Use quoted string value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_disposition.parameters << { param_attr => value }
     param_attr = nil
@@ -701,8 +891,8 @@ end
 	end
 
 
-      if p != eof || cs < 26
-        raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, data, "Only able to parse up to #{data[0..p]}")
+      if p != eof || cs < 40
+        raise Mail::Field::IncompleteParseError.new(Mail::ContentDispositionElement, data, p)
       end
 
       content_disposition