From 3f9cebcecb0c8797fb25a8225103965719fc9f0f Mon Sep 17 00:00:00 2001
From: Matthias Mullie <git@mullie.eu>
Date: Wed, 13 Sep 2017 18:34:54 +0200
Subject: [PATCH] Require that a regex has some content

Otherwise, the `//` that start a comment could be misread
as regexes.

Fixes #196
---
 src/JS.php          |  2 +-
 tests/js/JSTest.php | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/JS.php b/src/JS.php
index 250c625..4f5202d 100644
--- a/src/JS.php
+++ b/src/JS.php
@@ -242,7 +242,7 @@ protected function extractRegex()
                 (isset($match['after']) ? $match['after'] : '');
         };
 
-        $pattern = '(?P<regex>\/.*?(?<!\\\\)(\\\\\\\\)*\/[gimy]*)(?![0-9a-zA-Z\/])';
+        $pattern = '(?P<regex>\/(.|\\\\)+?((?<!\\\\)\\\\\\\\)*\/[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 45bd5c0..d9ff299 100644
--- a/tests/js/JSTest.php
+++ b/tests/js/JSTest.php
@@ -1115,6 +1115,17 @@ function someOtherFunction() {
             'if(!0||/^(https?:)?\/\//.test(\'xxx\'))alert(1)',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/196
+        $tests[] = array(
+            'if ( true ) {
+    console.log(true);
+// ...comment number 2 (something with dots?)
+} else {
+    console.log(false);
+}',
+            'if(!0){console.log(!0)}else{console.log(!1)}',
+        );
+
         // known minified files to help doublecheck changes in places not yet
         // anticipated in these tests
         $files = glob(__DIR__.'/sample/minified/*.js');