Merge branch 'Issue_160_Fix_Infinite_Loop'

Author: gregjacobs

src/htmlParser/HtmlParser.js

@@ -29,7 +29,7 @@ Autolinker.htmlParser.HtmlParser = Autolinker.Util.extend( Object, {
 	htmlRegex : (function() {
 		var commentTagRegex = /!--([\s\S]+?)--/,
 		    tagNameRegex = /[0-9a-zA-Z][0-9a-zA-Z:]*/,
-		    attrNameRegex = /[^\s\0"'>\/=\x01-\x1F\x7F]+/,   // the unicode range accounts for excluding control chars, and the delete char
+		    attrNameRegex = /[^\s"'>\/=\x00-\x1F\x7F]+/,   // the unicode range accounts for excluding control chars, and the delete char
 		    attrValueRegex = /(?:"[^"]*?"|'[^']*?'|[^'"=<>`\s]+)/, // double quoted, single quoted, or unquoted attribute values
 		    nameEqualsValueRegex = attrNameRegex.source + '(?:\\s*=\\s*' + attrValueRegex.source + ')?';  // optional '=[value]'
 
@@ -69,7 +69,7 @@ Autolinker.htmlParser.HtmlParser = Autolinker.Util.extend( Object, {
 
 							// Zero or more attributes following the tag name
 							'(?:',
-								'\\s*',                // any number of whitespace chars before an attribute
+								'(?:\\s+|\\b)',        // any number of whitespace chars before an attribute. NOTE: Using \s* here throws Chrome into an infinite loop for some reason, so using \s+|\b instead
 								nameEqualsValueRegex,  // attr="value" (with optional ="value" part)
 							')*',
 

tests/AutolinkerSpec.js

@@ -1249,6 +1249,41 @@ describe( "Autolinker", function() {
 			} );
 
 
+			it( "should not fail with an infinite loop for these given input strings (Issue #160)", function() {
+				var inputStrings = [
+					'asdf ouefof<33we oeweofjojfew oeijwffejifjew ojiwjoiwefj iowjefojwe iofjw:)<33',
+					'<33<33<33<33<33<33<33<33<33<33',
+					'<33<33<33<33<33<33<33<33<33<33<33'
+				];
+
+				inputStrings.forEach( function( str ) {
+					expect( autolinker.link( str ) ).toBe( str );  // no links in these, just making sure they don't fail with 100% cpu and an infinite loop
+				} );
+			} );
+
+
+			it( "should not fail with an infinite loop for an input string with " +
+				"completely invalid HTML (issue #160)",
+			function() {
+				var result = autolinker.link(
+					'<[email protected]\n' +
+					'He gave me a 1-800 customer care number that I\'ve called twice.  The last time I called, about 3 weeks ago, the customer rep said he would request an expedited response. He gave me a reference number which is  925767619. Thankyou very much for looking into this.\n' +
+					'\n' +
+					'Ronald D Brigham\n' +
+					'[email protected]'
+				);
+
+				expect( result ).toBe( [
+					'<<a href="mailto:[email protected]">[email protected]</a>',
+					'He gave me a 1-800 customer care number that I\'ve called twice.  The last time I called, about 3 weeks ago, the customer rep said he would request an expedited response. He gave me a reference number which is  925767619. Thankyou very much for looking into this.',
+					'',
+					'Ronald D Brigham',
+					'<a href="mailto:[email protected]">[email protected]</a>'
+				].join( '\n' ) );
+			} );
+
+
+
 			it( "should NOT modify the email address with other tags when inside another anchor", function() {
 				var input = [
 					'<div>First name: Subin</div>',