From 7dd8d25fdbe2535c5b8d73058283e388933dd7ea Mon Sep 17 00:00:00 2001
From: Matthias Mullie <git@mullie.eu>
Date: Thu, 10 Nov 2016 10:09:49 +0100
Subject: [PATCH] Improve regex detection

Fixes issue #142
---
 src/JS.php          |  7 ++++++-
 tests/js/JSTest.php | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/JS.php b/src/JS.php
index fbde70c..c2be733 100644
--- a/src/JS.php
+++ b/src/JS.php
@@ -222,7 +222,12 @@ protected function extractRegex()
             return $placeholder;
         };
 
-        $pattern = '\/.*?(?<!\\\\)(\\\\\\\\)*+\/[gimy]*(?![0-9a-zA-Z\/])';
+        // crazy regex explained: characters inside /.../ delimiters can be:
+        // * a /, as long as it's escaped with a \
+        //   * but that \ can not in itself be escaped
+        //   * so we need an uneven amount of \ if we have a /
+        // * any other character
+        $pattern = '\/([^\/]|(?<!\\\\)(\\\\\\\\)*\\\\\/)+\/[gimy]*(?![0-9a-zA-Z\/])';
 
         // a regular expression can only be followed by a few operators or some
         // of the RegExp methods (a `\` followed by a variable or value is
diff --git a/tests/js/JSTest.php b/tests/js/JSTest.php
index da1f63e..2fe611f 100644
--- a/tests/js/JSTest.php
+++ b/tests/js/JSTest.php
@@ -92,6 +92,22 @@ public function dataProvider()
             '/abc\/def\//.test("abc")',
             '/abc\/def\//.test("abc")',
         );
+        $tests[] = array(
+            '/abc\/def\//.test("abc\/def\/")',
+            '/abc\/def\//.test("abc\/def\/")',
+        );
+        $tests[] = array(
+            // there's an escape mess here; below regex represent this JS line:
+            // /abc\/def\\\//.test("abc/def\\/")
+            '/abc\/def\\\\\//.test("abc/def\\\/")',
+            '/abc\/def\\\\\//.test("abc/def\\\/")',
+        );
+        $tests[] = array(
+            // escape mess, this represents:
+            // /abc\/def\\\\\//.test("abc/def\\\\/")
+            '/abc\/def\\\\\\\\\//.test("abc/def\\\\\\\\/")',
+            '/abc\/def\\\\\\\\\//.test("abc/def\\\\\\\\/")',
+        );
         $tests[] = array(
             'var a = /abc\/def\//.test("abc")',
             'var a=/abc\/def\//.test("abc")',
@@ -832,6 +848,27 @@ function otherFuncName() {
             'var a=1',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/142
+        $tests[] = array(
+            'return {
+    l: ((116 * y) - 16) / 100,  // [0,100]
+    a: ((500 * (x - y)) + 128) / 255,   // [-128,127]
+    b: ((200 * (y - z)) + 128) / 255    // [-128,127]
+};',
+            'return{l:((116*y)-16)/100,a:((500*(x-y))+128)/255,b:((200*(y-z))+128)/255}'
+        );
+
+        // https://github.com/matthiasmullie/minify/issues/143
+        $tests[] = array(
+            "if(nutritionalPortionWeightUnit == 'lbs' && blockUnit == 'oz'){
+itemFat = (qty * (fat/nutritionalPortionWeight))/16;
+itemProtein = (qty * (protein/nutritionalPortionWeight))/16;
+itemCarbs = (qty * (carbs/nutritionalPortionWeight))/16;
+itemKcal = (qty * (kcal/nutritionalPortionWeight))/16;
+}",
+            "if(nutritionalPortionWeightUnit=='lbs'&&blockUnit=='oz'){itemFat=(qty*(fat/nutritionalPortionWeight))/16;itemProtein=(qty*(protein/nutritionalPortionWeight))/16;itemCarbs=(qty*(carbs/nutritionalPortionWeight))/16;itemKcal=(qty*(kcal/nutritionalPortionWeight))/16}",
+        );
+
         // update tests' expected results for cross-system compatibility
         foreach ($tests as &$test) {
             if (!empty($test[1])) {