Title: [213045] releases/WebKitGTK/webkit-2.16/Source/_javascript_Core
Revision
213045
Author
[email protected]
Date
2017-02-27 05:21:58 -0800 (Mon, 27 Feb 2017)

Log Message

Merge r212791 - Add more missing exception checks detected by running marathon.js.
https://bugs.webkit.org/show_bug.cgi?id=168697

Reviewed by Saam Barati.

* runtime/StringPrototype.cpp:
(JSC::replaceUsingRegExpSearch):
(JSC::replaceUsingStringSearch):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog (213044 => 213045)


--- releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog	2017-02-27 11:29:57 UTC (rev 213044)
+++ releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog	2017-02-27 13:21:58 UTC (rev 213045)
@@ -1,3 +1,14 @@
+2017-02-21  Mark Lam  <[email protected]>
+
+        Add more missing exception checks detected by running marathon.js.
+        https://bugs.webkit.org/show_bug.cgi?id=168697
+
+        Reviewed by Saam Barati.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::replaceUsingRegExpSearch):
+        (JSC::replaceUsingStringSearch):
+
 2017-02-21  Filip Pizlo  <[email protected]>
 
         Unreviewed, fix cloop. I managed to have my local patch for relanding be the one without the cloop

Modified: releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/runtime/StringPrototype.cpp (213044 => 213045)


--- releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/runtime/StringPrototype.cpp	2017-02-27 11:29:57 UTC (rev 213044)
+++ releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/runtime/StringPrototype.cpp	2017-02-27 13:21:58 UTC (rev 213045)
@@ -555,6 +555,7 @@
 
                 cachedCall.setThis(jsUndefined());
                 JSValue jsResult = cachedCall.call();
+                RETURN_IF_EXCEPTION(scope, encodedJSValue());
                 replacements.append(jsResult.toWTFString(exec));
                 RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
@@ -595,6 +596,7 @@
 
                 cachedCall.setThis(jsUndefined());
                 JSValue jsResult = cachedCall.call();
+                RETURN_IF_EXCEPTION(scope, encodedJSValue());
                 replacements.append(jsResult.toWTFString(exec));
                 RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
@@ -734,6 +736,7 @@
     auto scope = DECLARE_THROW_SCOPE(vm);
 
     const String& string = jsString->value(exec);
+    RETURN_IF_EXCEPTION(scope, encodedJSValue());
     String searchString = searchValue.toWTFString(exec);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to