fix(HTML Parser): fix nasty bug where malformed HTML would hang showdown

When feeding malformed HTML to showdown, the library would enter an infinite loop, effectively halting showdown's execution. Closes #393
showdownjs · Jun 2, 2017 · 6566c72 · 6566c72
1 parent 1eee6af
commit 6566c72
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 13 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git a/src/subParsers/hashHTMLBlocks.js b/src/subParsers/hashHTMLBlocks.js
@@ -50,17 +50,24 @@ showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
 
   for (var i = 0; i < blockTags.length; ++i) {
 
-    var opTagPos,
+    var opTagPos, ii = 0,
         rgx1     = new RegExp('^ {0,3}<' + blockTags[i] + '\\b[^>]*>', 'im'),
         patLeft  = '<' + blockTags[i] + '\\b[^>]*>',
         patRight = '</' + blockTags[i] + '>';
     // 1. Look for the first position of the first opening HTML tag in the text
     while ((opTagPos = showdown.helper.regexIndexOf(text, rgx1)) !== -1) {
       //2. Split the text in that position
-      var subTexts = showdown.helper.splitAtIndex(text, opTagPos);
+      var subTexts = showdown.helper.splitAtIndex(text, opTagPos),
       //3. Match recursively
-      subTexts[1] = showdown.helper.replaceRecursiveRegExp(subTexts[1], repFunc, patLeft, patRight, 'im');
-      text = subTexts[0].concat(subTexts[1]);
+          newSubText1 = showdown.helper.replaceRecursiveRegExp(subTexts[1], repFunc, patLeft, patRight, 'im');
+
+      // prevent an infinite loop
+      if (newSubText1 === subTexts[1]) {
+        break;
+      }
+
+      text = subTexts[0].concat(newSubText1);
+      ii++;
     }
   }
   // HR SPECIAL CASE

diff --git a/test/issues/#393.showdown-hangs-with-malformed-html.html b/test/issues/#393.showdown-hangs-with-malformed-html.html
@@ -0,0 +1 @@
+<p><p>malformed<p></p>
diff --git a/test/issues/#393.showdown-hangs-with-malformed-html.md b/test/issues/#393.showdown-hangs-with-malformed-html.md
@@ -0,0 +1 @@
+<p>malformed<p>