<!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>[201105] 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/201105">201105</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 15:36:01 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://trac.webkit.org/projects/webkit/changeset/199812">r199812</a> broke test262
https://bugs.webkit.org/show_bug.cgi?id=157595
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
Added a reasonable limit to the size of the match result array to catch possible
infinite loops when matching.
Added a new tests that creates an infinite loop in RegExp.prototype.[Symbol.match]
by creating a subclass of RegExp where the base RegExp's global flag is false and
the subclass overrides .global with a getter that always returns true.
* builtins/RegExpPrototype.js:
(match):
* tests/stress/regress-157595.js: Added.
(MyRegExp):
(MyRegExp.prototype.get global):
(test):
(catch):
Tools:
Added a new run type, runOneLargeHeap, for tests that use a large amount of memory.
This run type will not run with the --memory-limited option. Without that option,
we'll only the default test variant.
* Scripts/run-jsc-stress-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsRegExpPrototypejs">trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressregress157595js">trunk/Source/JavaScriptCore/tests/stress/regress-157595.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201104 => 201105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-18 22:27:47 UTC (rev 201104)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-18 22:36:01 UTC (rev 201105)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-18 Michael Saboff <msaboff@apple.com>
+
+ r199812 broke test262
+ https://bugs.webkit.org/show_bug.cgi?id=157595
+
+ Reviewed by Filip Pizlo.
+
+ Added a reasonable limit to the size of the match result array to catch possible
+ infinite loops when matching.
+ Added a new tests that creates an infinite loop in RegExp.prototype.[Symbol.match]
+ by creating a subclass of RegExp where the base RegExp's global flag is false and
+ the subclass overrides .global with a getter that always returns true.
+
+ * builtins/RegExpPrototype.js:
+ (match):
+ * tests/stress/regress-157595.js: Added.
+ (MyRegExp):
+ (MyRegExp.prototype.get global):
+ (test):
+ (catch):
+
</ins><span class="cx"> 2016-05-18 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Namespace object re-export should be handled as local export
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsRegExpPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js (201104 => 201105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js 2016-05-18 22:27:47 UTC (rev 201104)
+++ trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js 2016-05-18 22:36:01 UTC (rev 201105)
</span><span class="lines">@@ -97,8 +97,9 @@
</span><span class="cx"> let unicode = regexp.unicode;
</span><span class="cx"> regexp.lastIndex = 0;
</span><span class="cx"> let resultList = [];
</span><del>- let stringLength = str.length;
</del><span class="cx">
</span><ins>+ const maximumReasonableMatchSize = 100000000;
+
</ins><span class="cx"> while (true) {
</span><span class="cx"> let result = @regExpExec(regexp, str);
</span><span class="cx">
</span><span class="lines">@@ -108,6 +109,9 @@
</span><span class="cx"> return resultList;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (resultList.length > maximumReasonableMatchSize)
+ throw new @Error("Out of memory");
+
</ins><span class="cx"> if (!@isObject(result))
</span><span class="cx"> throw new @TypeError("RegExp.prototype.@@match call to RegExp.exec didn't return null or an object");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressregress157595js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/regress-157595.js (0 => 201105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/regress-157595.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/regress-157595.js 2016-05-18 22:36:01 UTC (rev 201105)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+// Test that an overridden global on a RegExp object doesn't cause an infinite loop
+// in String.match(). Instead it should eventually throw an Out of Memory exception.
+//@ runOneLargeHeap
+
+class MyRegExp extends RegExp {
+ constructor(pattern) {
+ super(pattern, "");
+ }
+
+ get global() {
+ return true;
+ }
+};
+
+function test()
+{
+ let r = new MyRegExp(".");
+
+ return "abc".match(r);
+}
+
+try {
+ test();
+} catch(e) {
+ if (e.message != "Out of memory")
+ throw "Wrong error: " + e;
+}
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201104 => 201105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-18 22:27:47 UTC (rev 201104)
+++ trunk/Tools/ChangeLog 2016-05-18 22:36:01 UTC (rev 201105)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-18 Michael Saboff <msaboff@apple.com>
+
+ r199812 broke test262
+ https://bugs.webkit.org/show_bug.cgi?id=157595
+
+ Reviewed by Filip Pizlo.
+
+ Added a new run type, runOneLargeHeap, for tests that use a large amount of memory.
+ This run type will not run with the --memory-limited option. Without that option,
+ we'll only the default test variant.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2016-05-18 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r200534) Command-+ no longer zooms pages
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (201104 => 201105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2016-05-18 22:27:47 UTC (rev 201104)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2016-05-18 22:36:01 UTC (rev 201105)
</span><span class="lines">@@ -784,6 +784,15 @@
</span><span class="cx"> run("ram-size-#{size}", "--forceRAMSize=#{size}")
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+def runOneLargeHeap
+ if $memoryLimited
+ $didAddRunCommand = true
+ puts "Skipping #{$collectionName}/#{$benchmark}"
+ else
+ run("default")
+ end
+end
+
</ins><span class="cx"> def runNoJIT
</span><span class="cx"> run("no-jit", "--useJIT=false")
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>