<!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>[207851] trunk/Source/JavaScriptCore</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/207851">207851</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 15:30:08 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ThrowScope::release() calls at all call sites of jsMakeNontrivialString().
https://bugs.webkit.org/show_bug.cgi?id=163990
Reviewed by Geoffrey Garen.
* runtime/ArrayPrototype.cpp:
(JSC::arrayProtoFuncToString):
* runtime/ErrorPrototype.cpp:
(JSC::errorProtoFuncToString):
* runtime/FunctionPrototype.cpp:
(JSC::functionProtoFuncToString):
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoFuncToString):
* runtime/StringPrototype.cpp:
(JSC::stringProtoFuncBig):
(JSC::stringProtoFuncSmall):
(JSC::stringProtoFuncBlink):
(JSC::stringProtoFuncBold):
(JSC::stringProtoFuncFixed):
(JSC::stringProtoFuncItalics):
(JSC::stringProtoFuncStrike):
(JSC::stringProtoFuncSub):
(JSC::stringProtoFuncSup):
(JSC::stringProtoFuncFontcolor):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncAnchor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorPrototypecpp">trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp">trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207850 => 207851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 22:27:06 UTC (rev 207850)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 22:30:08 UTC (rev 207851)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-10-25 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Add ThrowScope::release() calls at all call sites of jsMakeNontrivialString().
+ https://bugs.webkit.org/show_bug.cgi?id=163990
+
+ Reviewed by Geoffrey Garen.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::arrayProtoFuncToString):
+ * runtime/ErrorPrototype.cpp:
+ (JSC::errorProtoFuncToString):
+ * runtime/FunctionPrototype.cpp:
+ (JSC::functionProtoFuncToString):
+ * runtime/RegExpPrototype.cpp:
+ (JSC::regExpProtoFuncToString):
+ * runtime/StringPrototype.cpp:
+ (JSC::stringProtoFuncBig):
+ (JSC::stringProtoFuncSmall):
+ (JSC::stringProtoFuncBlink):
+ (JSC::stringProtoFuncBold):
+ (JSC::stringProtoFuncFixed):
+ (JSC::stringProtoFuncItalics):
+ (JSC::stringProtoFuncStrike):
+ (JSC::stringProtoFuncSub):
+ (JSC::stringProtoFuncSup):
+ (JSC::stringProtoFuncFontcolor):
+ (JSC::stringProtoFuncFontsize):
+ (JSC::stringProtoFuncAnchor):
+
+2016-10-25 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> JSStringJoiner::joinedLength() should limit joined string lengths to INT_MAX.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163937
</span><span class="cx"> <rdar://problem/28642990>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (207850 => 207851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-25 22:27:06 UTC (rev 207850)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-10-25 22:30:08 UTC (rev 207851)
</span><span class="lines">@@ -372,8 +372,10 @@
</span><span class="cx"> if (callType == CallType::None)
</span><span class="cx"> customJoinCase = true;
</span><span class="cx">
</span><del>- if (UNLIKELY(customJoinCase))
</del><ins>+ if (UNLIKELY(customJoinCase)) {
+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "[object ", thisObject->methodTable(vm)->className(thisObject), "]"));
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // 4. Return the result of calling the [[Call]] internal method of func providing array as the this value and an empty arguments list.
</span><span class="cx"> if (!isJSArray(thisObject) || callType != CallType::Host || callData.native.function != arrayProtoFuncJoin)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp (207850 => 207851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp 2016-10-25 22:27:06 UTC (rev 207850)
+++ trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp 2016-10-25 22:30:08 UTC (rev 207851)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> return JSValue::encode(name.isString() ? name : jsString(exec, nameString));
</span><span class="cx">
</span><span class="cx"> // 10. Return the result of concatenating name, ":", a single space character, and msg.
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, nameString, ": ", messageString));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp (207850 => 207851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2016-10-25 22:27:06 UTC (rev 207850)
+++ trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2016-10-25 22:30:08 UTC (rev 207851)
</span><span class="lines">@@ -94,8 +94,10 @@
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (thisValue.inherits(JSFunction::info())) {
</span><span class="cx"> JSFunction* function = jsCast<JSFunction*>(thisValue);
</span><del>- if (function->isHostOrBuiltinFunction())
</del><ins>+ if (function->isHostOrBuiltinFunction()) {
+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "function ", function->name(vm), "() {\n [native code]\n}"));
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> FunctionExecutable* executable = function->jsExecutable();
</span><span class="cx"> if (executable->isClass()) {
</span><span class="lines">@@ -108,11 +110,13 @@
</span><span class="cx"> StringView source = executable->source().provider()->getRange(
</span><span class="cx"> executable->parametersStartOffset(),
</span><span class="cx"> executable->parametersStartOffset() + executable->source().length());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, functionHeader, function->name(vm), source));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (thisValue.inherits(InternalFunction::info())) {
</span><span class="cx"> InternalFunction* function = asInternalFunction(thisValue);
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "function ", function->name(), "() {\n [native code]\n}"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,8 +125,10 @@
</span><span class="cx"> if (object->inlineTypeFlags() & TypeOfShouldCallGetCallData) {
</span><span class="cx"> CallData callData;
</span><span class="cx"> if (object->methodTable(vm)->getCallData(object, callData) != CallType::None) {
</span><del>- if (auto* classInfo = object->classInfo())
</del><ins>+ if (auto* classInfo = object->classInfo()) {
+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "function ", classInfo->className, "() {\n [native code]\n}"));
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp (207850 => 207851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-10-25 22:27:06 UTC (rev 207850)
+++ trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-10-25 22:30:08 UTC (rev 207851)
</span><span class="lines">@@ -241,6 +241,7 @@
</span><span class="cx"> String flags = flagsValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, '/', source, '/', flags));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (207850 => 207851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-10-25 22:27:06 UTC (rev 207850)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-10-25 22:30:08 UTC (rev 207851)
</span><span class="lines">@@ -1497,6 +1497,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<big>", s, "</big>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1510,6 +1511,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<small>", s, "</small>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1523,6 +1525,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<blink>", s, "</blink>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1536,6 +1539,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<b>", s, "</b>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1549,6 +1553,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<tt>", s, "</tt>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1562,6 +1567,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<i>", s, "</i>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1575,6 +1581,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<strike>", s, "</strike>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1588,6 +1595,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<sub>", s, "</sub>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1601,6 +1609,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<sup>", s, "</sup>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1619,6 +1628,7 @@
</span><span class="cx"> String color = a0.toWTFString(exec);
</span><span class="cx"> color.replaceWithLiteral('"', "&quot;");
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<font color=\"", color, "\">", s, "</font>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1673,6 +1683,7 @@
</span><span class="cx"> String fontSize = a0.toWTFString(exec);
</span><span class="cx"> fontSize.replaceWithLiteral('"', "&quot;");
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<font size=\"", fontSize, "\">", s, "</font>"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1691,6 +1702,7 @@
</span><span class="cx"> String anchor = a0.toWTFString(exec);
</span><span class="cx"> anchor.replaceWithLiteral('"', "&quot;");
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<a name=\"", anchor, "\">", s, "</a>"));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>