<!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>[209022] 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/209022">209022</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-28 14:35:39 -0800 (Mon, 28 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix exception scope verification failures in runtime/String* files.
https://bugs.webkit.org/show_bug.cgi?id=165067
Reviewed by Saam Barati.
* runtime/StringConstructor.cpp:
(JSC::stringFromCodePoint):
(JSC::constructWithStringConstructor):
* runtime/StringObject.cpp:
(JSC::StringObject::put):
(JSC::StringObject::putByIndex):
(JSC::StringObject::defineOwnProperty):
* runtime/StringPrototype.cpp:
(JSC::jsSpliceSubstrings):
(JSC::jsSpliceSubstringsWithSeparators):
(JSC::replaceUsingRegExpSearch):
(JSC::replaceUsingStringSearch):
(JSC::repeatCharacter):
(JSC::replace):
(JSC::stringProtoFuncReplaceUsingStringSearch):
(JSC::stringProtoFuncCharAt):
(JSC::stringProtoFuncCodePointAt):
(JSC::stringProtoFuncConcat):
(JSC::stringProtoFuncIndexOf):
(JSC::stringProtoFuncLastIndexOf):
(JSC::splitStringByOneCharacterImpl):
(JSC::stringProtoFuncSplitFast):
(JSC::stringProtoFuncSubstring):
(JSC::stringProtoFuncToLowerCase):
(JSC::stringProtoFuncToUpperCase):
(JSC::toLocaleCase):
(JSC::trimString):
(JSC::stringProtoFuncIncludes):
(JSC::builtinStringIncludesInternal):
(JSC::stringProtoFuncIterator):
(JSC::normalize):
(JSC::stringProtoFuncNormalize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringConstructorcpp">trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringObjectcpp">trunk/Source/JavaScriptCore/runtime/StringObject.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 (209021 => 209022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-28 22:30:11 UTC (rev 209021)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-28 22:35:39 UTC (rev 209022)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2016-11-28 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Fix exception scope verification failures in runtime/String* files.
+ https://bugs.webkit.org/show_bug.cgi?id=165067
+
+ Reviewed by Saam Barati.
+
+ * runtime/StringConstructor.cpp:
+ (JSC::stringFromCodePoint):
+ (JSC::constructWithStringConstructor):
+ * runtime/StringObject.cpp:
+ (JSC::StringObject::put):
+ (JSC::StringObject::putByIndex):
+ (JSC::StringObject::defineOwnProperty):
+ * runtime/StringPrototype.cpp:
+ (JSC::jsSpliceSubstrings):
+ (JSC::jsSpliceSubstringsWithSeparators):
+ (JSC::replaceUsingRegExpSearch):
+ (JSC::replaceUsingStringSearch):
+ (JSC::repeatCharacter):
+ (JSC::replace):
+ (JSC::stringProtoFuncReplaceUsingStringSearch):
+ (JSC::stringProtoFuncCharAt):
+ (JSC::stringProtoFuncCodePointAt):
+ (JSC::stringProtoFuncConcat):
+ (JSC::stringProtoFuncIndexOf):
+ (JSC::stringProtoFuncLastIndexOf):
+ (JSC::splitStringByOneCharacterImpl):
+ (JSC::stringProtoFuncSplitFast):
+ (JSC::stringProtoFuncSubstring):
+ (JSC::stringProtoFuncToLowerCase):
+ (JSC::stringProtoFuncToUpperCase):
+ (JSC::toLocaleCase):
+ (JSC::trimString):
+ (JSC::stringProtoFuncIncludes):
+ (JSC::builtinStringIncludesInternal):
+ (JSC::stringProtoFuncIterator):
+ (JSC::normalize):
+ (JSC::stringProtoFuncNormalize):
+
+2016-11-28 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Fix exception scope verification failures in ObjectConstructor.cpp and ObjectPrototype.cpp.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165051
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp (209021 => 209022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-11-28 22:30:11 UTC (rev 209021)
+++ trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-11-28 22:35:39 UTC (rev 209022)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsString(exec, builder.toString()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,7 +129,9 @@
</span><span class="cx">
</span><span class="cx"> if (!exec->argumentCount())
</span><span class="cx"> return JSValue::encode(StringObject::create(vm, structure));
</span><del>- return JSValue::encode(StringObject::create(vm, structure, exec->uncheckedArgument(0).toString(exec)));
</del><ins>+ JSString* str = exec->uncheckedArgument(0).toString(exec);
+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
+ return JSValue::encode(StringObject::create(vm, structure, str));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConstructType StringConstructor::getConstructData(JSCell*, ConstructData& constructData)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringObject.cpp (209021 => 209022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-11-28 22:30:11 UTC (rev 209021)
+++ trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-11-28 22:35:39 UTC (rev 209022)
</span><span class="lines">@@ -67,13 +67,18 @@
</span><span class="cx">
</span><span class="cx"> StringObject* thisObject = jsCast<StringObject*>(cell);
</span><span class="cx">
</span><del>- if (UNLIKELY(isThisValueAltered(slot, thisObject)))
</del><ins>+ if (UNLIKELY(isThisValueAltered(slot, thisObject))) {
+ scope.release();
</ins><span class="cx"> return ordinarySetSlow(exec, thisObject, propertyName, value, slot.thisValue(), slot.isStrictMode());
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (propertyName == vm.propertyNames->length)
</span><span class="cx"> return typeError(exec, scope, slot.isStrictMode(), ASCIILiteral(ReadonlyPropertyWriteError));
</span><del>- if (std::optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (std::optional<uint32_t> index = parseIndex(propertyName)) {
+ scope.release();
</ins><span class="cx"> return putByIndex(cell, exec, index.value(), value, slot.isStrictMode());
</span><ins>+ }
+ scope.release();
</ins><span class="cx"> return JSObject::put(cell, exec, propertyName, value, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -85,6 +90,7 @@
</span><span class="cx"> StringObject* thisObject = jsCast<StringObject*>(cell);
</span><span class="cx"> if (thisObject->internalValue()->canGetIndex(propertyName))
</span><span class="cx"> return typeError(exec, scope, shouldThrow, ASCIILiteral(ReadonlyPropertyWriteError));
</span><ins>+ scope.release();
</ins><span class="cx"> return JSObject::putByIndex(cell, exec, propertyName, value, shouldThrow);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,9 +122,11 @@
</span><span class="cx"> ASSERT(isCurrentDefined);
</span><span class="cx"> bool isExtensible = thisObject->isExtensible(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, false);
</span><ins>+ scope.release();
</ins><span class="cx"> return validateAndApplyPropertyDescriptor(exec, nullptr, propertyName, isExtensible, descriptor, isCurrentDefined, current, throwException);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return Base::defineOwnProperty(object, exec, propertyName, descriptor, throwException);
</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 (209021 => 209022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-11-28 22:30:11 UTC (rev 209021)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-11-28 22:35:39 UTC (rev 209022)
</span><span class="lines">@@ -297,6 +297,7 @@
</span><span class="cx"> if (position <= 0 && length >= sourceSize)
</span><span class="cx"> return sourceVal;
</span><span class="cx"> // We could call String::substringSharingImpl(), but this would result in redundant checks.
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, StringImpl::createSubstringSharingImpl(*source.impl(), std::max(0, position), std::min(sourceSize, length)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -322,6 +323,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, WTFMove(impl));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -340,6 +342,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, WTFMove(impl));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -355,6 +358,7 @@
</span><span class="cx"> if (position <= 0 && length >= sourceSize)
</span><span class="cx"> return sourceVal;
</span><span class="cx"> // We could call String::substringSharingImpl(), but this would result in redundant checks.
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, StringImpl::createSubstringSharingImpl(*source.impl(), std::max(0, position), std::min(sourceSize, length)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -398,6 +402,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, WTFMove(impl));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -429,6 +434,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, WTFMove(impl));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -627,10 +633,12 @@
</span><span class="cx"> args.append(jsNumber(result.start));
</span><span class="cx"> args.append(string);
</span><span class="cx">
</span><del>- JSValue value = call(exec, replaceValue, callType, callData, jsUndefined(), args);
</del><ins>+ JSValue replacement = call(exec, replaceValue, callType, callData, jsUndefined(), args);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><del>- replacements.append(value.toString(exec)->value(exec));
</del><ins>+ String replacementString = replacement.toString(exec)->value(exec);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ replacements.append(replacementString);
+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> } else {
</span><span class="cx"> int replLen = replacementString.length();
</span><span class="cx"> if (lastIndex < result.start || replLen) {
</span><span class="lines">@@ -663,6 +671,7 @@
</span><span class="cx"> if (UNLIKELY(!sourceRanges.tryConstructAndAppend(lastIndex, sourceLen - lastIndex)))
</span><span class="cx"> OUT_OF_MEMORY(exec, scope);
</span><span class="cx"> }
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsSpliceSubstringsWithSeparators(exec, string, source, sourceRanges.data(), sourceRanges.size(), replacements.data(), replacements.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -754,6 +763,7 @@
</span><span class="cx">
</span><span class="cx"> size_t leftLength = stringImpl->length() - matchEnd;
</span><span class="cx"> String rightPart(StringImpl::createSubstringSharingImpl(*stringImpl, matchEnd, leftLength));
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(JSC::jsString(exec, leftPart, middlePart, rightPart));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -786,6 +796,7 @@
</span><span class="cx">
</span><span class="cx"> std::fill_n(buffer, repeatCount, character);
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(&exec, WTFMove(impl));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -839,6 +850,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString* string = thisValue.toString(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return replace(vm, exec, string, searchValue, replaceValue);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -866,6 +878,7 @@
</span><span class="cx"> JSString* string = exec->thisValue().toString(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return replaceUsingStringSearch(vm, exec, string, exec->argument(0), exec->argument(1));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -909,6 +922,7 @@
</span><span class="cx"> auto viewWithString = thisValue.toString(exec)->viewWithUnderlyingString(*exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> StringView view = viewWithString.view;
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="cx"> if (a0.isUInt32()) {
</span><span class="cx"> uint32_t i = a0.asUInt32();
</span><span class="lines">@@ -966,6 +980,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> String string = thisValue.toWTFString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> unsigned length = string.length();
</span><span class="cx">
</span><span class="cx"> JSValue argument0 = exec->argument(0);
</span><span class="lines">@@ -979,6 +994,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><span class="cx"> double doublePosition = argument0.toInteger(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> if (doublePosition >= 0 && doublePosition < length)
</span><span class="cx"> return JSValue::encode(jsNumber(codePointAt(string, static_cast<unsigned>(doublePosition), length)));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -990,11 +1006,16 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><del>- if (thisValue.isString() && exec->argumentCount() == 1)
- return JSValue::encode(jsString(exec, asString(thisValue), exec->uncheckedArgument(0).toString(exec)));
</del><ins>+ if (thisValue.isString() && exec->argumentCount() == 1) {
+ JSString* str = exec->uncheckedArgument(0).toString(exec);
+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
+ scope.release();
+ return JSValue::encode(jsString(exec, asString(thisValue), str));
+ }
</ins><span class="cx">
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsStringFromArguments(exec, thisValue));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1011,7 +1032,9 @@
</span><span class="cx"> JSValue a1 = exec->argument(1);
</span><span class="cx">
</span><span class="cx"> JSString* thisJSString = thisValue.toString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> JSString* otherJSString = a0.toString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx">
</span><span class="cx"> unsigned pos = 0;
</span><span class="cx"> if (!a1.isUndefined()) {
</span><span class="lines">@@ -1055,8 +1078,10 @@
</span><span class="cx"> JSValue a1 = exec->argument(1);
</span><span class="cx">
</span><span class="cx"> JSString* thisJSString = thisValue.toString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> unsigned len = thisJSString->length();
</span><span class="cx"> JSString* otherJSString = a0.toString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx">
</span><span class="cx"> double dpos = a1.toIntegerPreserveNaN(exec);
</span><span class="cx"> unsigned startPosition;
</span><span class="lines">@@ -1119,6 +1144,9 @@
</span><span class="cx"> template<typename CharacterType>
</span><span class="cx"> static ALWAYS_INLINE bool splitStringByOneCharacterImpl(ExecState* exec, JSArray* result, JSValue originalValue, const String& input, StringImpl* string, UChar separatorCharacter, size_t& position, unsigned& resultLength, unsigned limitLength)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 12. Let q = p.
</span><span class="cx"> size_t matchPosition;
</span><span class="cx"> const CharacterType* characters = string->characters<CharacterType>();
</span><span class="lines">@@ -1132,6 +1160,7 @@
</span><span class="cx"> // 2. Call the [[DefineOwnProperty]] internal method of A with arguments ToString(lengthA),
</span><span class="cx"> // Property Descriptor {[[Value]]: T, [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true}, and false.
</span><span class="cx"> result->putDirectIndex(exec, resultLength, jsSubstring(exec, originalValue, input, position, matchPosition - position));
</span><ins>+ RETURN_IF_EXCEPTION(scope, false);
</ins><span class="cx"> // 3. Increment lengthA by 1.
</span><span class="cx"> // 4. If lengthA == lim, return A.
</span><span class="cx"> if (++resultLength == limitLength)
</span><span class="lines">@@ -1186,6 +1215,7 @@
</span><span class="cx"> // 11. If separator is undefined, then
</span><span class="cx"> if (separatorValue.isUndefined()) {
</span><span class="cx"> // a. Call the [[DefineOwnProperty]] internal method of A with arguments "0",
</span><ins>+ scope.release();
</ins><span class="cx"> result->putDirectIndex(exec, 0, jsStringWithReuse(exec, thisValue, input));
</span><span class="cx"> // b. Return A.
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -1197,8 +1227,10 @@
</span><span class="cx"> // b. If z is not false, return A.
</span><span class="cx"> // c. Call CreateDataProperty(A, "0", S).
</span><span class="cx"> // d. Return A.
</span><del>- if (!separator.isEmpty())
</del><ins>+ if (!separator.isEmpty()) {
+ scope.release();
</ins><span class="cx"> result->putDirectIndex(exec, 0, jsStringWithReuse(exec, thisValue, input));
</span><ins>+ }
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1210,6 +1242,7 @@
</span><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> result->putDirectIndex(exec, position, jsSingleCharacterString(exec, input[position]));
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> } while (++position < limit);
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -1231,12 +1264,17 @@
</span><span class="cx"> separatorCharacter = separatorImpl->characters16()[0];
</span><span class="cx">
</span><span class="cx"> if (stringImpl->is8Bit()) {
</span><del>- if (splitStringByOneCharacterImpl<LChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit))
</del><ins>+ if (splitStringByOneCharacterImpl<LChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit)) {
+ scope.release();
</ins><span class="cx"> return JSValue::encode(result);
</span><ins>+ }
</ins><span class="cx"> } else {
</span><del>- if (splitStringByOneCharacterImpl<UChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit))
</del><ins>+ if (splitStringByOneCharacterImpl<UChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit)) {
+ scope.release();
</ins><span class="cx"> return JSValue::encode(result);
</span><ins>+ }
</ins><span class="cx"> }
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> } else {
</span><span class="cx"> // 13. Let q = p.
</span><span class="cx"> size_t matchPosition;
</span><span class="lines">@@ -1249,6 +1287,7 @@
</span><span class="cx"> // through q (exclusive).
</span><span class="cx"> // 2. Call CreateDataProperty(A, ToString(lengthA), T).
</span><span class="cx"> result->putDirectIndex(exec, resultLength, jsSubstring(exec, thisValue, input, position, matchPosition - position));
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> // 3. Increment lengthA by 1.
</span><span class="cx"> // 4. If lengthA == lim, return A.
</span><span class="cx"> if (++resultLength == limit)
</span><span class="lines">@@ -1263,6 +1302,7 @@
</span><span class="cx"> // 15. Let T be a String value equal to the substring of S consisting of the characters at positions p (inclusive)
</span><span class="cx"> // through s (exclusive).
</span><span class="cx"> // 16. Call CreateDataProperty(A, ToString(lengthA), T).
</span><ins>+ scope.release();
</ins><span class="cx"> result->putDirectIndex(exec, resultLength++, jsSubstring(exec, thisValue, input, position, input.length() - position));
</span><span class="cx">
</span><span class="cx"> // 17. Return A.
</span><span class="lines">@@ -1345,6 +1385,7 @@
</span><span class="cx"> RELEASE_ASSERT(len >= 0);
</span><span class="cx">
</span><span class="cx"> double start = a0.toNumber(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> double end;
</span><span class="cx"> if (!(start >= 0)) // check for negative values or NaN
</span><span class="cx"> start = 0;
</span><span class="lines">@@ -1354,6 +1395,7 @@
</span><span class="cx"> end = len;
</span><span class="cx"> else {
</span><span class="cx"> end = a1.toNumber(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> if (!(end >= 0)) // check for negative values or NaN
</span><span class="cx"> end = 0;
</span><span class="cx"> else if (end > len)
</span><span class="lines">@@ -1378,10 +1420,12 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString* sVal = thisValue.toString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> const String& s = sVal->value(exec);
</span><span class="cx"> String lowercasedString = s.convertToLowercaseWithoutLocale();
</span><span class="cx"> if (lowercasedString.impl() == s.impl())
</span><span class="cx"> return JSValue::encode(sVal);
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsString(exec, lowercasedString));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1394,10 +1438,12 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString* sVal = thisValue.toString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> const String& s = sVal->value(exec);
</span><span class="cx"> String uppercasedString = s.convertToUppercaseWithoutLocale();
</span><span class="cx"> if (uppercasedString.impl() == s.impl())
</span><span class="cx"> return JSValue::encode(sVal);
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsString(exec, uppercasedString));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1431,6 +1477,7 @@
</span><span class="cx">
</span><span class="cx"> // 2. Let S be ToString(O).
</span><span class="cx"> JSString* sVal = thisValue.toString(state);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> const String& s = sVal->value(state);
</span><span class="cx">
</span><span class="cx"> // 3. ReturnIfAbrupt(S).
</span><span class="lines">@@ -1499,6 +1546,7 @@
</span><span class="cx"> return throwVMTypeError(state, scope, u_errorName(error));
</span><span class="cx">
</span><span class="cx"> // 18. Return L.
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsString(state, lower));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1793,7 +1841,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwTypeError(exec, scope);
</span><span class="cx"> String str = thisValue.toString(exec)->value(exec);
</span><del>- RETURN_IF_EXCEPTION(scope, JSValue());
</del><ins>+ RETURN_IF_EXCEPTION(scope, { });
</ins><span class="cx">
</span><span class="cx"> unsigned left = 0;
</span><span class="cx"> if (trimKind & TrimLeft) {
</span><span class="lines">@@ -1810,6 +1858,7 @@
</span><span class="cx"> if (left == 0 && right == str.length() && thisValue.isString())
</span><span class="cx"> return thisValue;
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, str.substringSharingImpl(left, right - left));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1947,6 +1996,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue positionArg = exec->argument(1);
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return stringIncludesImpl(vm, exec, stringToSearchIn, searchString, positionArg);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1967,6 +2017,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue positionArg = exec->argument(1);
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return stringIncludesImpl(vm, exec, stringToSearchIn, searchString, positionArg);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1979,6 +2030,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString* string = thisValue.toString(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
</ins><span class="cx"> return JSValue::encode(JSStringIterator::create(exec, exec->callee()->globalObject()->stringIteratorStructure(), string));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2006,6 +2058,7 @@
</span><span class="cx"> if (U_FAILURE(status))
</span><span class="cx"> return throwTypeError(exec, scope);
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return jsString(exec, WTFMove(impl));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2039,6 +2092,7 @@
</span><span class="cx"> return throwVMError(exec, scope, createRangeError(exec, ASCIILiteral("argument does not match any normalization form")));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(normalize(exec, view.upconvertedCharacters(), view.length(), form));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>