Fix scanning for regex vs. division

horde · Nov 14, 2013 · fc6a6a6 · fc6a6a6
1 parent 2c12081
commit fc6a6a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/framework/Text_Filter_Jsmin/lib/Horde/Text/Filter/Jsmin.php b/framework/Text_Filter_Jsmin/lib/Horde/Text/Filter/Jsmin.php
@@ -240,7 +240,8 @@ protected function _isAlphaNum($c)
 
     protected function _isRegexLiteral($oldindex)
     {
-        if (strspn($this->_a, "(,=:[!&|?+-~*/{\n ")) {
+        /* We aren't dividing. */
+        if (strspn($this->_a, "(,=:[!&|?+-~*/{;")) {
             return true;
         }
 

diff --git a/framework/Text_Filter_Jsmin/test/Horde/Text/Filter/Jsmin/JsminTest.php b/framework/Text_Filter_Jsmin/test/Horde/Text/Filter/Jsmin/JsminTest.php
@@ -72,6 +72,13 @@ public function testBug12787()
             'function foo(a){return/\//.test(a);}',
              Horde_Text_Filter::filter($js, 'JavascriptMinify')
          );
+
+        $js2 = 'var a = 0, b = c / 100 | 0;';
+
+        $this->assertNotEquals(
+            $js2,
+             Horde_Text_Filter::filter($js2, 'JavascriptMinify')
+         );
     }
 
 }