Merge pull request #63 from matthewd/no-slow

Avoid another pathological input
tenderlove · Jun 1, 2016 · 24353cb · 24353cb
2 parents 334044b + 36bcf38
commit 24353cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/rails_autolink/helpers.rb b/lib/rails_autolink/helpers.rb
@@ -79,7 +79,7 @@ def auto_link(text, *args, &block) #link = :all, html = {}, &block)
           AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, /<\/a>/i]
 
           AUTO_EMAIL_LOCAL_RE = /[\w.!#\$%&'*\/=?^`{|}~+-]/
-          AUTO_EMAIL_RE = /[\w.!#\$%+-]\.?#{AUTO_EMAIL_LOCAL_RE}*@[\w-]+(?:\.[\w-]+)+/
+          AUTO_EMAIL_RE = /(?<!#{AUTO_EMAIL_LOCAL_RE})[\w.!#\$%+-]\.?#{AUTO_EMAIL_LOCAL_RE}*@[\w-]+(?:\.[\w-]+)+/
 
           BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
 

diff --git a/test/test_rails_autolink.rb b/test/test_rails_autolink.rb
@@ -331,10 +331,12 @@ def test_autolink_with_trailing_amp_on_link
   end
 
   def test_auto_link_does_not_timeout_when_parsing_odd_email_input
-    inputs = %w(
+    inputs = %W(
       foo@...................................
       foo@........................................
       foo@.............................................
+
+      #{'foo' * 20000}@
     )
 
     inputs.each do |input|