<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243246] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243246">243246</a></dd>
<dt>Author</dt> <dd>tzagallo@apple.com</dd>
<dt>Date</dt> <dd>2019-03-20 15:12:12 -0700 (Wed, 20 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>JSC::createError needs to check for OOM in errorDescriptionForValue
https://bugs.webkit.org/show_bug.cgi?id=196032
<rdar://problem/46842740>

Reviewed by Mark Lam.

JSTests:

* stress/create-error-out-of-memory-rope-string.js: Added.

Source/JavaScriptCore:

We were missing exceptions checks at two levels:
- In errorDescriptionForValue, when the value is a string, we should
  check that JSString::value returns a valid string, since we might run
  out of memory if it is a rope and we need to resolve it.
- In createError, we should check for the result of errorDescriptionForValue
  before concatenating it with the message provided by the caller.

* runtime/ExceptionHelpers.cpp:
(JSC::errorDescriptionForValue):
(JSC::createError):
* runtime/ExceptionHelpers.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionHelperscpp">trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionHelpersh">trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstresscreateerroroutofmemoryropestringjs">trunk/JSTests/stress/create-error-out-of-memory-rope-string.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (243245 => 243246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2019-03-20 22:04:15 UTC (rev 243245)
+++ trunk/JSTests/ChangeLog     2019-03-20 22:12:12 UTC (rev 243246)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-03-20  Tadeu Zagallo  <tzagallo@apple.com>
+
+        JSC::createError needs to check for OOM in errorDescriptionForValue
+        https://bugs.webkit.org/show_bug.cgi?id=196032
+        <rdar://problem/46842740>
+
+        Reviewed by Mark Lam.
+
+        * stress/create-error-out-of-memory-rope-string.js: Added.
+
</ins><span class="cx"> 2019-03-19  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, reduce # of iterations to avoid timing out after r242991
</span></span></pre></div>
<a id="trunkJSTestsstresscreateerroroutofmemoryropestringjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/create-error-out-of-memory-rope-string.js (0 => 243246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/create-error-out-of-memory-rope-string.js                           (rev 0)
+++ trunk/JSTests/stress/create-error-out-of-memory-rope-string.js      2019-03-20 22:12:12 UTC (rev 243246)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+var foo = 'yy?x\uFFFD$w    5?\uFFFDo\uFFFD?\uFFFD\'i?\uFFFDE-N\uFFFD\uFFFD6_\uFFFD\\ d';
+foo = foo.padEnd(2147483644, 1);
+eval('foo()');
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (243245 => 243246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-03-20 22:04:15 UTC (rev 243245)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-03-20 22:12:12 UTC (rev 243246)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2019-03-20  Tadeu Zagallo  <tzagallo@apple.com>
+
+        JSC::createError needs to check for OOM in errorDescriptionForValue
+        https://bugs.webkit.org/show_bug.cgi?id=196032
+        <rdar://problem/46842740>
+
+        Reviewed by Mark Lam.
+
+        We were missing exceptions checks at two levels:
+        - In errorDescriptionForValue, when the value is a string, we should
+          check that JSString::value returns a valid string, since we might run
+          out of memory if it is a rope and we need to resolve it.
+        - In createError, we should check for the result of errorDescriptionForValue
+          before concatenating it with the message provided by the caller.
+
+        * runtime/ExceptionHelpers.cpp:
+        (JSC::errorDescriptionForValue):
+        (JSC::createError):
+        * runtime/ExceptionHelpers.h:
+
</ins><span class="cx"> 2019-03-20  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: DOM: include window as part of any event listener chain
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp (243245 => 243246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp 2019-03-20 22:04:15 UTC (rev 243245)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp    2019-03-20 22:12:12 UTC (rev 243246)
</span><span class="lines">@@ -89,21 +89,26 @@
</span><span class="cx">     return createReferenceError(exec, message);
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-JSString* errorDescriptionForValue(ExecState* exec, JSValue v)
</del><ins>+String errorDescriptionForValue(ExecState* exec, JSValue v)
</ins><span class="cx"> {
</span><del>-    if (v.isString())
-        return jsNontrivialString(exec, makeString('"', asString(v)->value(exec), '"'));
</del><ins>+    if (v.isString()) {
+        String string = asString(v)->value(exec);
+        if (!string)
+            return string;
+        return tryMakeString('"', string, '"');
+    }
+
</ins><span class="cx">     if (v.isSymbol())
</span><del>-        return jsNontrivialString(exec, asSymbol(v)->descriptiveString());
</del><ins>+        return asSymbol(v)->descriptiveString();
</ins><span class="cx">     if (v.isObject()) {
</span><span class="cx">         VM& vm = exec->vm();
</span><span class="cx">         CallData callData;
</span><span class="cx">         JSObject* object = asObject(v);
</span><span class="cx">         if (object->methodTable(vm)->getCallData(object, callData) != CallType::None)
</span><del>-            return vm.smallStrings.functionString();
-        return jsString(exec, JSObject::calculatedClassName(object));
</del><ins>+            return vm.smallStrings.functionString()->value(exec);
+        return JSObject::calculatedClassName(object);
</ins><span class="cx">     }
</span><del>-    return v.toString(exec);
</del><ins>+    return v.toString(exec)->value(exec);
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> static String defaultApproximateSourceError(const String& originalMessage, const String& sourceText)
</span><span class="lines">@@ -269,9 +274,12 @@
</span><span class="cx">     VM& vm = exec->vm();
</span><span class="cx">     auto scope = DECLARE_CATCH_SCOPE(vm);
</span><span class="cx"> 
</span><del>-    String errorMessage = tryMakeString(errorDescriptionForValue(exec, value)->value(exec), ' ', message);
-    if (errorMessage.isNull())
</del><ins>+    String valueDescription = errorDescriptionForValue(exec, value);
+    if (!valueDescription)
</ins><span class="cx">         return createOutOfMemoryError(exec);
</span><ins>+    String errorMessage = tryMakeString(valueDescription, ' ', message);
+    if (!errorMessage)
+        return createOutOfMemoryError(exec);
</ins><span class="cx">     scope.assertNoException();
</span><span class="cx">     JSObject* exception = createTypeError(exec, errorMessage, appender, runtimeTypeForValue(vm, value));
</span><span class="cx">     ASSERT(exception->isErrorInstance());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h (243245 => 243246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h   2019-03-20 22:04:15 UTC (rev 243245)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h      2019-03-20 22:12:12 UTC (rev 243246)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> JSObject* createNotAConstructorError(ExecState*, JSValue);
</span><span class="cx"> JSObject* createNotAFunctionError(ExecState*, JSValue);
</span><span class="cx"> JSObject* createErrorForInvalidGlobalAssignment(ExecState*, const String&);
</span><del>-JSString* errorDescriptionForValue(ExecState*, JSValue);
</del><ins>+String errorDescriptionForValue(ExecState*, JSValue);
</ins><span class="cx"> 
</span><span class="cx"> JS_EXPORT_PRIVATE Exception* throwOutOfMemoryError(ExecState*, ThrowScope&);
</span><span class="cx"> JS_EXPORT_PRIVATE Exception* throwStackOverflowError(ExecState*, ThrowScope&);
</span></span></pre>
</div>
</div>

</body>
</html>