Correctly parse addresses that begin with a comment.

mikel · May 13, 2013 · 1505198 · 1505198
1 parent ab2af8c
commit 1505198
Show file tree

Hide file tree

Showing 8 changed files with 15,982 additions and 15,804 deletions.
diff --git a/lib/mail/parsers/address_lists_parser.rb b/lib/mail/parsers/address_lists_parser.rb
@@ -69,7 +69,7 @@ def parse(s)
           # Ignore address end events if they don't have
           # a matching address start event.
           next if address_s.nil?
-          if address.local.nil? && local_dot_atom_pre_comment_e && local_dot_atom_e
+          if address.local.nil? && local_dot_atom_pre_comment_e && local_dot_atom_s && local_dot_atom_e
             if address.domain
               address.local = s[local_dot_atom_s..local_dot_atom_e] if address
             else

diff --git a/lib/mail/parsers/ragel/common.rl b/lib/mail/parsers/ragel/common.rl
@@ -55,9 +55,9 @@
   # local_part:
   domain_text = (DQUOTE (FWS? qcontent)+ FWS? DQUOTE) | atext+;
   local_dot_atom_text = ("."* domain_text "."*)+;
-  local_dot_atom = (CFWS?
-                   local_dot_atom_text %local_dot_atom_pre_comment_e
-                   CFWS?);
+  local_dot_atom = CFWS?
+                   (local_dot_atom_text >local_dot_atom_s %local_dot_atom_pre_comment_e)
+                   CFWS?;
   obs_local_part = word ("." word)*;
   local_part = (local_dot_atom >local_dot_atom_s %local_dot_atom_e |
                 (quoted_string %local_quoted_string_e) |