<!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>[208698] 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/208698">208698</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-14 11:26:20 -0800 (Mon, 14 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RegExpObject::exec/match should handle errors gracefully.
https://bugs.webkit.org/show_bug.cgi?id=155145
<rdar://problem/27435934>
Reviewed by Keith Miller.
JSTests:
* stress/regexp-prototype-exec-on-too-long-rope.js: Added.
* stress/regexp-prototype-match-on-too-long-rope.js: Added.
* stress/regexp-prototype-test-on-too-long-rope.js: Added.
Source/JavaScriptCore:
1. Added some missing exception checks to RegExpObject::execInline() and
RegExpObject::matchInline().
2. Updated related code to work with ExceptionScope verification requirements.
* dfg/DFGOperations.cpp:
* runtime/RegExpObjectInlines.h:
(JSC::RegExpObject::execInline):
(JSC::RegExpObject::matchInline):
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoFuncTestFast):
(JSC::regExpProtoFuncExec):
(JSC::regExpProtoFuncMatchFast):</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="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpObjectInlinesh">trunk/Source/JavaScriptCore/runtime/RegExpObjectInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressregexpprototypeexecontoolongropejs">trunk/JSTests/stress/regexp-prototype-exec-on-too-long-rope.js</a></li>
<li><a href="#trunkJSTestsstressregexpprototypematchontoolongropejs">trunk/JSTests/stress/regexp-prototype-match-on-too-long-rope.js</a></li>
<li><a href="#trunkJSTestsstressregexpprototypetestontoolongropejs">trunk/JSTests/stress/regexp-prototype-test-on-too-long-rope.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208697 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-11-14 19:16:02 UTC (rev 208697)
+++ trunk/JSTests/ChangeLog 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-11-14 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ RegExpObject::exec/match should handle errors gracefully.
+ https://bugs.webkit.org/show_bug.cgi?id=155145
+ <rdar://problem/27435934>
+
+ Reviewed by Keith Miller.
+
+ * stress/regexp-prototype-exec-on-too-long-rope.js: Added.
+ * stress/regexp-prototype-match-on-too-long-rope.js: Added.
+ * stress/regexp-prototype-test-on-too-long-rope.js: Added.
+
+2016-11-14 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Enhance run-jsc-stress-test script to allow optional test specific options to be added for all test run configurations.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164695
</span><span class="cx">
</span></span></pre></div>
<a id="trunkJSTestsstressregexpprototypeexecontoolongropejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/regexp-prototype-exec-on-too-long-rope.js (0 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/regexp-prototype-exec-on-too-long-rope.js (rev 0)
+++ trunk/JSTests/stress/regexp-prototype-exec-on-too-long-rope.js 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+//@ if $buildType == "debug" then runFTLNoCJIT("--maxSingleAllocationSize=20000000") else skip end
+
+function shouldEqual(actual, expected) {
+ if (actual != expected) {
+ throw "ERROR: expect " + expected + ", actual " + actual;
+ }
+}
+
+s0 = "";
+s1 = "NaNxxxxx";
+
+try {
+ for (var count = 0; count < 27; count++) {
+ var oldS1 = s1;
+ s1 += s1;
+ s0 = oldS1;
+ }
+} catch (e) { }
+
+try {
+ s1 += s0;
+} catch (e) { }
+
+var exception;
+try {
+ /x/.exec(s1);
+} catch (e) {
+ exception = e;
+}
+
+shouldEqual(exception, "Error: Out of memory");
+
</ins></span></pre></div>
<a id="trunkJSTestsstressregexpprototypematchontoolongropejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/regexp-prototype-match-on-too-long-rope.js (0 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/regexp-prototype-match-on-too-long-rope.js (rev 0)
+++ trunk/JSTests/stress/regexp-prototype-match-on-too-long-rope.js 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+//@ if $buildType == "debug" then runFTLNoCJIT("--maxSingleAllocationSize=20000000") else skip end
+
+function shouldEqual(actual, expected) {
+ if (actual != expected) {
+ throw "ERROR: expect " + expected + ", actual " + actual;
+ }
+}
+
+s0 = "";
+s1 = "NaNxxxxx";
+
+try {
+ for (var count = 0; count < 27; count++) {
+ var oldS1 = s1;
+ s1 += s1;
+ s0 = oldS1;
+ }
+} catch (e) { }
+
+try {
+ s1 += s0;
+} catch (e) { }
+
+var exception;
+try {
+ /x/[Symbol.match](s1);
+} catch (e) {
+ exception = e;
+}
+
+shouldEqual(exception, "Error: Out of memory");
+
</ins></span></pre></div>
<a id="trunkJSTestsstressregexpprototypetestontoolongropejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/regexp-prototype-test-on-too-long-rope.js (0 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/regexp-prototype-test-on-too-long-rope.js (rev 0)
+++ trunk/JSTests/stress/regexp-prototype-test-on-too-long-rope.js 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+//@ if $buildType == "debug" then runFTLNoCJIT("--maxSingleAllocationSize=20000000") else skip end
+
+function shouldEqual(actual, expected) {
+ if (actual != expected) {
+ throw "ERROR: expect " + expected + ", actual " + actual;
+ }
+}
+
+s0 = "";
+s1 = "NaNxxxxx";
+
+try {
+ for (var count = 0; count < 27; count++) {
+ var oldS1 = s1;
+ s1 += s1;
+ s0 = oldS1;
+ }
+} catch (e) { }
+
+try {
+ s1 += s0;
+} catch (e) { }
+
+var exception;
+try {
+ /x/.test(s1);
+} catch (e) {
+ exception = e;
+}
+
+shouldEqual(exception, "Error: Out of memory");
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208697 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-14 19:16:02 UTC (rev 208697)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-14 Mark Lam <mark.lam@apple.com>
+
+ RegExpObject::exec/match should handle errors gracefully.
+ https://bugs.webkit.org/show_bug.cgi?id=155145
+ <rdar://problem/27435934>
+
+ Reviewed by Keith Miller.
+
+ 1. Added some missing exception checks to RegExpObject::execInline() and
+ RegExpObject::matchInline().
+ 2. Updated related code to work with ExceptionScope verification requirements.
+
+ * dfg/DFGOperations.cpp:
+ * runtime/RegExpObjectInlines.h:
+ (JSC::RegExpObject::execInline):
+ (JSC::RegExpObject::matchInline):
+ * runtime/RegExpPrototype.cpp:
+ (JSC::regExpProtoFuncTestFast):
+ (JSC::regExpProtoFuncExec):
+ (JSC::regExpProtoFuncMatchFast):
+
</ins><span class="cx"> 2016-11-13 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add debugging facility to limit the max single allocation size.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (208697 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-11-14 19:16:02 UTC (rev 208697)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -792,12 +792,15 @@
</span><span class="cx">
</span><span class="cx"> VM& vm = globalObject->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> JSValue argument = JSValue::decode(encodedArgument);
</span><span class="cx">
</span><span class="cx"> JSString* input = argument.toStringOrNull(exec);
</span><ins>+ ASSERT(!!scope.exception() == !input);
</ins><span class="cx"> if (!input)
</span><del>- return JSValue::encode(jsUndefined());
</del><ins>+ return encodedJSValue();
+ scope.release();
</ins><span class="cx"> return JSValue::encode(regExpObject->execInline(exec, globalObject, input));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -816,8 +819,10 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> JSString* input = argument.toStringOrNull(exec);
</span><ins>+ ASSERT(!!scope.exception() == !input);
</ins><span class="cx"> if (!input)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(asRegExpObject(base)->exec(exec, globalObject, input));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -863,8 +868,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSString* input = argument.toStringOrNull(exec);
</span><ins>+ ASSERT(!!scope.exception() == !input);
</ins><span class="cx"> if (!input)
</span><span class="cx"> return false;
</span><ins>+ scope.release();
</ins><span class="cx"> return asRegExpObject(base)->test(exec, globalObject, input);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpObjectInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpObjectInlines.h (208697 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpObjectInlines.h 2016-11-14 19:16:02 UTC (rev 208697)
+++ trunk/Source/JavaScriptCore/runtime/RegExpObjectInlines.h 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -57,10 +57,13 @@
</span><span class="cx">
</span><span class="cx"> JSValue RegExpObject::execInline(ExecState* exec, JSGlobalObject* globalObject, JSString* string)
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> RegExp* regExp = this->regExp();
</span><span class="cx"> RegExpConstructor* regExpConstructor = globalObject->regExpConstructor();
</span><del>- String input = string->value(exec); // FIXME: Handle errors. https://bugs.webkit.org/show_bug.cgi?id=155145
- VM& vm = globalObject->vm();
</del><ins>+ String input = string->value(exec);
+ RETURN_IF_EXCEPTION(scope, JSValue());
</ins><span class="cx">
</span><span class="cx"> bool globalOrSticky = regExp->globalOrSticky();
</span><span class="cx">
</span><span class="lines">@@ -91,10 +94,14 @@
</span><span class="cx"> MatchResult RegExpObject::matchInline(
</span><span class="cx"> ExecState* exec, JSGlobalObject* globalObject, JSString* string)
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> RegExp* regExp = this->regExp();
</span><span class="cx"> RegExpConstructor* regExpConstructor = globalObject->regExpConstructor();
</span><del>- String input = string->value(exec); // FIXME: Handle errors. https://bugs.webkit.org/show_bug.cgi?id=155145
- VM& vm = globalObject->vm();
</del><ins>+ String input = string->value(exec);
+ RETURN_IF_EXCEPTION(scope, MatchResult());
+
</ins><span class="cx"> if (!regExp->global() && !regExp->sticky())
</span><span class="cx"> return regExpConstructor->performMatch(vm, regExp, string, input, 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp (208697 => 208698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-11-14 19:16:02 UTC (rev 208697)
+++ trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-11-14 19:26:20 UTC (rev 208698)
</span><span class="lines">@@ -105,8 +105,10 @@
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString* string = exec->argument(0).toStringOrNull(exec);
</span><ins>+ ASSERT(!!scope.exception() == !string);
</ins><span class="cx"> if (!string)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(jsBoolean(asRegExpObject(thisValue)->test(exec, exec->lexicalGlobalObject(), string)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -119,8 +121,10 @@
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><span class="cx"> return throwVMTypeError(exec, scope, "Builtin RegExp exec can only be called on a RegExp object");
</span><span class="cx"> JSString* string = exec->argument(0).toStringOrNull(exec);
</span><ins>+ ASSERT(!!scope.exception() == !string);
</ins><span class="cx"> if (!string)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(asRegExpObject(thisValue)->exec(exec, exec->lexicalGlobalObject(), string));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -133,10 +137,14 @@
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString* string = exec->argument(0).toStringOrNull(exec);
</span><ins>+ ASSERT(!!scope.exception() == !string);
</ins><span class="cx"> if (!string)
</span><del>- return JSValue::encode(jsUndefined());
- if (!asRegExpObject(thisValue)->regExp()->global())
</del><ins>+ return encodedJSValue();
+ if (!asRegExpObject(thisValue)->regExp()->global()) {
+ scope.release();
</ins><span class="cx"> return JSValue::encode(asRegExpObject(thisValue)->exec(exec, exec->lexicalGlobalObject(), string));
</span><ins>+ }
+ scope.release();
</ins><span class="cx"> return JSValue::encode(asRegExpObject(thisValue)->matchGlobal(exec, exec->lexicalGlobalObject(), string));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>