Merge 0ce8431 into 922fe11

zendframework · Aug 16, 2019 · 62e8ecd · 62e8ecd
2 parents 922fe11 + 0ce8431
commit 62e8ecd
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 11 deletions.
diff --git a/src/StripTags.php b/src/StripTags.php
@@ -179,19 +179,18 @@ public function filter($value)
         $value = (string) $value;
 
         // Strip HTML comments first
-        while (strpos($value, '<!--') !== false) {
-            $pos   = strrpos($value, '<!--');
-            $start = substr($value, 0, $pos);
-            $value = substr($value, $pos);
-
-            // If there is no comment closing tag, strip whole text
-            if (! preg_match('/--\s*>/s', $value)) {
-                $value = '';
+        $open     = '<!--';
+        $openLen  = strlen($open);
+        $close    = '-->';
+        $closeLen = strlen($close);
+        while (($start = strpos($value, $open)) !== false) {
+            $end = strpos($value, $close, $start + $openLen);
+
+            if ($end === false) {
+                $value = substr($value, 0, $start);
             } else {
-                $value = preg_replace('/<(?:!(?:--[\s\S]*?--\s*)?(>))/s', '', $value);
+                $value = substr($value, 0, $start) . substr($value, $end + $closeLen);
             }
-
-            $value = $start . $value;
         }
 
         // Initialize accumulator for filtered data

diff --git a/test/StripTagsTest.php b/test/StripTagsTest.php
@@ -511,6 +511,34 @@ public function testMultiQuoteInput()
         $this->assertEquals($expected, $filter->filter($input));
     }
 
+    public function badCommentProvider()
+    {
+        return [
+            ['A <!--> B', 'A '],  // Should be treated as just an open
+            ['A <!---> B', 'A '], // Should be treated as just an open
+            ['A <!----> B', 'A  B'],
+            ['A <!-- --> B', 'A  B'],
+            ['A <!--> B <!--> C', 'A  C'],
+            ['A <!-- -- > -- > --> B', 'A  B'],
+            ["A <!-- B\n C\n D --> E", 'A  E'],
+            ["A <!-- B\n <!-- C\n D --> E", 'A  E'],
+            ['A <!-- B <!-- C --> D --> E', 'A  D -- E'],
+            ["A <!--\n B\n <!-- C\n D \n\n\n--> E", 'A  E'],
+            ['A <!--My favorite operators are > and <!--> B', 'A  B'],
+        ];
+    }
+
+    /**
+     * @dataProvider badCommentProvider
+     *
+     * @param string $input
+     * @param string $expected
+     */
+    public function testBadCommentTags($input, $expected)
+    {
+        $this->assertEquals($expected, $this->_filter->filter($input));
+    }
+
      /**
      * @group ZF-10256
      */