mail 2.7.0.rc1 → 2.7.0

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