Merge pull request #41 from thephpleague/fix-infinite-loop

Fix infinite loop and link-in-link-in-image parsing (#37)
thephpleague · Dec 27, 2014 · da01b49 · da01b49
2 parents ec8bcb9 + b02cf79
commit da01b49
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/src/Delimiter/Delimiter.php b/src/Delimiter/Delimiter.php
@@ -37,6 +37,9 @@ class Delimiter
     /** @var bool */
     protected $canClose;
 
+    /** @var bool */
+    protected $active;
+
     /** @var int|null */
     protected $index;
 
@@ -55,6 +58,7 @@ public function __construct($char, $numDelims, $pos, $canOpen, $canClose, $index
         $this->pos = $pos;
         $this->canOpen = $canOpen;
         $this->canClose = $canClose;
+        $this->active = true;
         $this->index = $index;
     }
 
@@ -98,6 +102,26 @@ public function setCanOpen($canOpen)
         return $this;
     }
 
+    /**
+     * @return bool
+     */
+    public function isActive()
+    {
+        return $this->active;
+    }
+
+    /**
+     * @param bool $active
+     *
+     * @return $this
+     */
+    public function setActive($active)
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
     /**
      * @return String
      */

diff --git a/src/Delimiter/DelimiterStack.php b/src/Delimiter/DelimiterStack.php
@@ -85,17 +85,11 @@ public function removeAll(Delimiter $stackBottom = null)
     public function removeEarlierMatches($character)
     {
         $opener = $this->top;
-        $closerAbove = null;
         while ($opener !== null) {
             if ($opener->getChar() === $character) {
-                if ($closerAbove) {
-                    $closerAbove->setPrevious($opener->getPrevious());
-                } else {
-                    $this->top = $opener->getPrevious();
-                }
-            } else {
-                $closerAbove = $opener;
+                $opener->setActive(false);
             }
+
             $opener = $opener->getPrevious();
         }
     }

diff --git a/src/Inline/Parser/CloseBracketParser.php b/src/Inline/Parser/CloseBracketParser.php
@@ -63,6 +63,13 @@ public function parse(ContextInterface $context, InlineParserContext $inlineCont
             return false;
         }
 
+        if (!$opener->isActive()) {
+            // no matched opener; remove from emphasis stack
+            $inlineContext->getDelimiterStack()->removeDelimiter($opener);
+
+            return false;
+        }
+
         $isImage = $opener->getChar() === '!';
 
         // Instead of copying a slice, we null out the parts of inlines that don't correspond to linkText; later, we'll