Merge pull request #146 from stof/pcre_jit_error

Use possessive quantifiers to avoid reaching PCRE limits
tijsverkoyen · Sep 6, 2016 · bb379f4 · bb379f4
2 parents e4ba269 + a6c086a
commit bb379f4
Show file tree

Hide file tree

Showing 3 changed files with 1,173 additions and 3 deletions.
diff --git a/src/Css/Processor.php b/src/Css/Processor.php
@@ -3,6 +3,7 @@
 namespace TijsVerkoyen\CssToInlineStyles\Css;
 
 use TijsVerkoyen\CssToInlineStyles\Css\Rule\Processor as RuleProcessor;
+use TijsVerkoyen\CssToInlineStyles\Css\Rule\Rule;
 
 class Processor
 {
@@ -50,15 +51,15 @@ public function getCssFromStyleTags($html)
     private function doCleanup($css)
     {
         // remove charset
-        $css = preg_replace('/@charset "[^"]+";/', '', $css);
+        $css = preg_replace('/@charset "[^"]++";/', '', $css);
         // remove media queries
-        $css = preg_replace('/@media [^{]*{([^{}]|{[^{}]*})*}/', '', $css);
+        $css = preg_replace('/@media [^{]*+{([^{}]++|{[^{}]*+})*+}/', '', $css);
 
         $css = str_replace(array("\r", "\n"), '', $css);
         $css = str_replace(array("\t"), ' ', $css);
         $css = str_replace('"', '\'', $css);
         $css = preg_replace('|/\*.*?\*/|', '', $css);
-        $css = preg_replace('/\s\s+/', ' ', $css);
+        $css = preg_replace('/\s\s++/', ' ', $css);
         $css = trim($css);
 
         return $css;

diff --git a/tests/Css/ProcessorTest.php b/tests/Css/ProcessorTest.php
@@ -94,6 +94,13 @@ public function testCssWithMediaQueries()
         $this->assertEquals(1, $rules[0]->getOrder());
     }
 
+    public function testCssWithBigMediaQueries()
+    {
+        $rules = $this->processor->getRules(file_get_contents(__DIR__.'/test.css'));
+
+        $this->assertCount(414, $rules);
+    }
+
     public function testMakeSureMediaQueriesAreRemoved()
     {
         $css = '@media tv and (min-width: 700px) and (orientation: landscape) {.foo {display: none;}}';