Changeset 203853 in webkit

Timestamp:

Jul 28, 2016 6:23:27 PM (8 years ago)

Author:

mark.lam@apple.com

Message:

ASSERTION FAILED in errorProtoFuncToString() when Error name is a single char string.
​https://bugs.webkit.org/show_bug.cgi?id=160324
<rdar://problem/27389572>

Reviewed by Keith Miller.

The issue is that errorProtoFuncToString() was using jsNontrivialString() to
generate the error string even when the name string can be a single character
string. This is incorrect. We should be using jsString() instead.

• runtime/ErrorPrototype.cpp:

(JSC::errorProtoFuncToString):

• tests/stress/errors-with-simple-names-or-messages-should-not-crash-toString.js: Added.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/ErrorPrototype.cpp (modified) (1 diff)
• tests/stress/errors-with-simple-names-or-messages-should-not-crash-toString.js (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-07-28  Mark Lam  <mark.lam@apple.com>
+
+        ASSERTION FAILED in errorProtoFuncToString() when Error name is a single char string.
+        https://bugs.webkit.org/show_bug.cgi?id=160324
+        <rdar://problem/27389572>
+
+        Reviewed by Keith Miller.
+
+        The issue is that errorProtoFuncToString() was using jsNontrivialString() to
+        generate the error string even when the name string can be a single character
+        string.  This is incorrect.  We should be using jsString() instead.
+
+        * runtime/ErrorPrototype.cpp:
+        (JSC::errorProtoFuncToString):
+        * tests/stress/errors-with-simple-names-or-messages-should-not-crash-toString.js: Added.
+
 2016-07-28  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp

@@ -119 +119 @@
     // 9. If msg is the empty String, return name.
     if (!messageString.length())
-        return JSValue::encode(name.isString() ? name : jsNontrivialString(exec, nameString));
+        return JSValue::encode(name.isString() ? name : jsString(exec, nameString));
 
     // 10. Return the result of concatenating name, ":", a single space character, and msg.