Changeset 248716 in webkit

Timestamp:

Aug 15, 2019 9:31:19 AM (5 years ago)

Author:

mark.lam@apple.com

Message:

More missing exception checks in String.prototype.
​https://bugs.webkit.org/show_bug.cgi?id=200762
<rdar://problem/54333896>

Reviewed by Michael Saboff.

JSTests:

• stress/missing-exception-check-in-string-lastIndexOf.js: Added.
• stress/missing-exception-check-in-string-toLower.js: Added.
• stress/missing-exception-check-in-string-toUpper.js: Added.

Source/JavaScriptCore:

• runtime/StringPrototype.cpp:

(JSC::replaceUsingRegExpSearch):
(JSC::operationStringProtoFuncReplaceRegExpString):
(JSC::stringProtoFuncLastIndexOf):
(JSC::stringProtoFuncToLowerCase):
(JSC::stringProtoFuncToUpperCase):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/missing-exception-check-in-string-lastIndexOf.js (added)
• JSTests/stress/missing-exception-check-in-string-toLower.js (added)
• JSTests/stress/missing-exception-check-in-string-toUpper.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/StringPrototype.cpp (modified) (5 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2019-08-15  Mark Lam  <mark.lam@apple.com>
+
+        More missing exception checks in String.prototype.
+        https://bugs.webkit.org/show_bug.cgi?id=200762
+        <rdar://problem/54333896>
+
+        Reviewed by Michael Saboff.
+
+        * stress/missing-exception-check-in-string-lastIndexOf.js: Added.
+        * stress/missing-exception-check-in-string-toLower.js: Added.
+        * stress/missing-exception-check-in-string-toUpper.js: Added.
+
 2019-08-14  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-15  Mark Lam  <mark.lam@apple.com>
+
+        More missing exception checks in String.prototype.
+        https://bugs.webkit.org/show_bug.cgi?id=200762
+        <rdar://problem/54333896>
+
+        Reviewed by Michael Saboff.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::replaceUsingRegExpSearch):
+        (JSC::operationStringProtoFuncReplaceRegExpString):
+        (JSC::stringProtoFuncLastIndexOf):
+        (JSC::stringProtoFuncToLowerCase):
+        (JSC::stringProtoFuncToUpperCase):
+
 2019-08-15  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp

@@ -530 +530 @@
 
     String source = string->value(exec);
+    RETURN_IF_EXCEPTION(scope, nullptr);
     unsigned sourceLen = source.length();
     RETURN_IF_EXCEPTION(scope, nullptr);
@@ -755 +756 @@
     VM& vm = exec->vm();
     NativeCallFrameTracer tracer(&vm, exec);
-    
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
     CallData callData;
     String replacementString = replaceString->value(exec);
-    return replaceUsingRegExpSearch(
-        vm, exec, thisValue, searchValue, callData, CallType::None, replacementString, replaceString);
+    RETURN_IF_EXCEPTION(scope, nullptr);
+    RELEASE_AND_RETURN(scope, replaceUsingRegExpSearch(
+        vm, exec, thisValue, searchValue, callData, CallType::None, replacementString, replaceString));
 }
 
@@ -1126 +1129 @@
 
     String thisString = thisJSString->value(exec);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
     String otherString = otherJSString->value(exec);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
     size_t result;
     if (!startPosition)
@@ -1447 +1452 @@
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
     String s = sVal->value(exec);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
     String lowercasedString = s.convertToLowercaseWithoutLocale();
     if (lowercasedString.impl() == s.impl())
@@ -1464 +1470 @@
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
     String s = sVal->value(exec);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
     String uppercasedString = s.convertToUppercaseWithoutLocale();
     if (uppercasedString.impl() == s.impl())