Changeset 197185 in webkit for trunk/Source/JavaScriptCore/testRegExp.cpp

Timestamp:

Feb 26, 2016, 11:18:06 AM (9 years ago)

Author:

[email protected]

Message:

Make testRegExp not crash when given an invalid regexp
​https://bugs.webkit.org/show_bug.cgi?id=154732

Reviewed by Mark Lam.

• testRegExp.cpp:

(parseRegExpLine):

File:

• trunk/Source/JavaScriptCore/testRegExp.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/testRegExp.cpp

@@ -340 +340 @@
     ++i;
 
-    return RegExp::create(vm, pattern.toString(), regExpFlags(line + i));
+    RegExp* r = RegExp::create(vm, pattern.toString(), regExpFlags(line + i));
+    if (r->isValid())
+        return r;
+    return nullptr;
 }
 
@@ -466 +469 @@
                 if (regExpTest)
                     delete regExpTest;
+            } else if (linePtr[0] == '-') {
+                tests++;
+                regexp = 0; // Reset the live regexp to avoid confusing other subsequent tests
+                bool successfullyParsed = parseRegExpLine(vm, linePtr + 1, lineLength - 1);
+                if (successfullyParsed) {
+                    failures++;
+                    fprintf(stderr, "Failure on line %u. '%s' is not a valid regexp\n", lineNumber, linePtr + 1);
+                }
             }
         }