[jan] Fix upstream regression causing infite loops with empty CSS doc…

…uments (Bug #14318).
horde · Apr 7, 2016 · c462001 · c462001
1 parent 0973d78
commit c462001
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/framework/Css_Parser/lib/Horde/Css/Parser.php b/framework/Css_Parser/lib/Horde/Css/Parser.php
@@ -52,6 +52,11 @@ class Horde_Css_Parser
      */
     public function __construct($css, Sabberworm\CSS\Settings $settings = null)
     {
+        if (!strlen($css)) {
+            $this->doc = new Sabberworm\CSS\CSSList\Document();
+            return;
+        }
+
         if (is_null($settings)) {
             $settings = Sabberworm\CSS\Settings::create();
             $settings->withMultibyteSupport(false);

diff --git a/framework/Css_Parser/package.xml b/framework/Css_Parser/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Fix upstream regression causing infite loops with empty CSS documents (Bug #14318).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -414,7 +414,7 @@
    <date>2016-04-05</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Fix upstream regression causing infite loops with empty CSS documents (Bug #14318).
    </notes>
   </release>
  </changelog>