Changeset 205937 in webkit

Timestamp:

Sep 14, 2016 4:17:59 PM (8 years ago)

Author:

msaboff@apple.com

Message:

YARR doesn't check for invalid flags for literal regular expressions
​https://bugs.webkit.org/show_bug.cgi?id=161995

Reviewed by Mark Lam.

JSTests:

New test.

• stress/regress-161995.js: Added.

(testStatic):
(catch):

Source/JavaScriptCore:

Added a new error and a check that the flags are valid when we create a
literal regular expression.

• runtime/RegExp.cpp:

(JSC::RegExp::finishCreation):

• yarr/YarrPattern.cpp:

(JSC::Yarr::YarrPattern::errorMessage):
(JSC::Yarr::YarrPattern::compile):

• yarr/YarrPattern.h:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/regress-161995.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/RegExp.cpp (modified) (1 diff)
• Source/JavaScriptCore/yarr/YarrPattern.cpp (modified) (2 diffs)
• Source/JavaScriptCore/yarr/YarrPattern.h (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2016-09-14  Michael Saboff  <msaboff@apple.com>
+
+        YARR doesn't check for invalid flags for literal regular expressions
+        https://bugs.webkit.org/show_bug.cgi?id=161995
+
+        Reviewed by Mark Lam.
+
+        New test.
+
+        * stress/regress-161995.js: Added.
+        (testStatic):
+        (catch):
+
 2016-09-14  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-14  Michael Saboff  <msaboff@apple.com>
+
+        YARR doesn't check for invalid flags for literal regular expressions
+        https://bugs.webkit.org/show_bug.cgi?id=161995
+
+        Reviewed by Mark Lam.
+
+        Added a new error and a check that the flags are valid when we create a
+        literal regular expression.
+
+        * runtime/RegExp.cpp:
+        (JSC::RegExp::finishCreation):
+        * yarr/YarrPattern.cpp:
+        (JSC::Yarr::YarrPattern::errorMessage):
+        (JSC::Yarr::YarrPattern::compile):
+        * yarr/YarrPattern.h:
+
 2016-09-14  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/runtime/RegExp.cpp

@@ -224 +224 @@
     Base::finishCreation(vm);
     Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm.stackLimit());
-    if (m_constructionError)
+    if (!isValid())
         m_state = ParseError;
     else

trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp

@@ -908 +908 @@
         REGEXP_ERROR_PREFIX "invalid escaped character for unicode pattern",
         REGEXP_ERROR_PREFIX "too many nested disjunctions",
-        REGEXP_ERROR_PREFIX "pattern exceeds string length limits"
+        REGEXP_ERROR_PREFIX "pattern exceeds string length limits",
+        REGEXP_ERROR_PREFIX "invalid flags"
     };
 
@@ -917 +918 @@
 {
     YarrPatternConstructor constructor(*this, stackLimit);
+
+    if (m_flags == InvalidFlags)
+        return errorMessage(InvalidRegularExpressionFlags);
 
     if (const char* error = parse(constructor, patternString, unicode()))

trunk/Source/JavaScriptCore/yarr/YarrPattern.h

@@ -322 +322 @@
         TooManyDisjunctions,
         OffsetTooLarge,
+        InvalidRegularExpressionFlags,
         NumberOfErrorCodes
     };