Changeset 254687 in webkit

Timestamp:

Jan 16, 2020 9:26:21 AM (4 years ago)

Author:

mark.lam@apple.com

Message:

operationToObject() should check for a null errorMessage.
​https://bugs.webkit.org/show_bug.cgi?id=206339
<rdar://problem/58449666>

Reviewed by Yusuke Suzuki.

JSTests:

• stress/operationToObject-should-check-for-null-errorMessage.js: Added.

Source/JavaScriptCore:

r224280 introduced operationToObject() with an option to specify a custom error
message. r254252 added a scenario where the passed in error message is null but
did not update operationToObject() to allow for this. This patch adds the
missing null check.

• dfg/DFGOperations.cpp:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/operationToObject-should-check-for-null-errorMessage.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGOperations.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-01-16  Mark Lam  <mark.lam@apple.com>
+
+        operationToObject() should check for a null errorMessage.
+        https://bugs.webkit.org/show_bug.cgi?id=206339
+        <rdar://problem/58449666>
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/operationToObject-should-check-for-null-errorMessage.js: Added.
+
 2020-01-15  Caitlin Potter <caitp@igalia.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-01-16  Mark Lam  <mark.lam@apple.com>
+
+        operationToObject() should check for a null errorMessage.
+        https://bugs.webkit.org/show_bug.cgi?id=206339
+        <rdar://problem/58449666>
+
+        Reviewed by Yusuke Suzuki.
+
+        r224280 introduced operationToObject() with an option to specify a custom error
+        message.  r254252 added a scenario where the passed in error message is null but
+        did not update operationToObject() to allow for this.  This patch adds the
+        missing null check.
+
+        * dfg/DFGOperations.cpp:
+
 2020-01-16  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -456 +456 @@
 
     if (UNLIKELY(value.isUndefinedOrNull())) {
-        if (errorMessage->length()) {
+        if (errorMessage && errorMessage->length()) {
             throwVMTypeError(globalObject, scope, errorMessage);
             return nullptr;