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

Timestamp:

Dec 13, 2017, 11:38:51 AM (7 years ago)

Author:

[email protected]

Message:

Unreviewed rollout of r225695. Caused a crash on yahoo login page.

That bug tracked in ​https://bugs.webkit.org/show_bug.cgi?id=180761.

File:

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

trunk/Source/JavaScriptCore/testRegExp.cpp

@@ -316 +316 @@
 }
 
-static RegExp* parseRegExpLine(VM& vm, char* line, int lineLength, const char** regexpError)
+static RegExp* parseRegExpLine(VM& vm, char* line, int lineLength)
 {
     StringBuilder pattern;
-
+    
     if (line[0] != '/')
         return 0;
@@ -331 +331 @@
 
     RegExp* r = RegExp::create(vm, pattern.toString(), regExpFlags(line + i));
-    if (!r->isValid()) {
-        *regexpError = r->errorMessage();
-        return nullptr;
-    }
-    return r;
+    if (r->isValid())
+        return r;
+    return nullptr;
 }
 
@@ -434 +432 @@
         char* linePtr = 0;
         unsigned int lineNumber = 0;
-        const char* regexpError = nullptr;
 
         while ((linePtr = fgets(&lineBuffer[0], MaxLineLength, testCasesFile))) {
@@ -448 +445 @@
 
             if (linePtr[0] == '/') {
-                regexp = parseRegExpLine(vm, linePtr, lineLength, &regexpError);
-                if (!regexp) {
-                    failures++;
-                    fprintf(stderr, "Failure on line %u. '%s' %s\n", lineNumber, linePtr, regexpError);
-                }
+                regexp = parseRegExpLine(vm, linePtr, lineLength);
             } else if (linePtr[0] == ' ') {
                 RegExpTest* regExpTest = parseTestLine(linePtr, lineLength);
@@ -469 +462 @@
                 tests++;
                 regexp = 0; // Reset the live regexp to avoid confusing other subsequent tests
-                bool successfullyParsed = parseRegExpLine(vm, linePtr + 1, lineLength - 1, &regexpError);
+                bool successfullyParsed = parseRegExpLine(vm, linePtr + 1, lineLength - 1);
                 if (successfullyParsed) {
                     failures++;
-                    fprintf(stderr, "Failure on line %u. '%s' %s\n", lineNumber, linePtr + 1, regexpError);
+                    fprintf(stderr, "Failure on line %u. '%s' is not a valid regexp\n", lineNumber, linePtr + 1);
                 }
             }