<!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>[218819] 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/218819">218819</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2017-06-26 12:34:21 -0700 (Mon, 26 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash in JSC::Lexer<unsigned char>::setCode
https://bugs.webkit.org/show_bug.cgi?id=172754

Reviewed by Mark Lam.

JSTests:

* stress/dont-reserve-huge-capacity-lexer.js: Added.
(catch):

Source/JavaScriptCore:

The lexer was asking one of its buffers to reserve initial space that
was O(text size in bytes). For large sources, this would end up causing
the vector to overflow and crash. This patch changes this code be like
the Lexer's other buffers and to only reserve a small starting buffer.

* parser/Lexer.cpp:
(JSC::Lexer<T>::setCode):</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="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressdontreservehugecapacitylexerjs">trunk/JSTests/stress/dont-reserve-huge-capacity-lexer.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (218818 => 218819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2017-06-26 19:13:56 UTC (rev 218818)
+++ trunk/JSTests/ChangeLog     2017-06-26 19:34:21 UTC (rev 218819)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-06-26  Saam Barati  <sbarati@apple.com>
+
+        Crash in JSC::Lexer<unsigned char>::setCode
+        https://bugs.webkit.org/show_bug.cgi?id=172754
+
+        Reviewed by Mark Lam.
+
+        * stress/dont-reserve-huge-capacity-lexer.js: Added.
+        (catch):
+
</ins><span class="cx"> 2017-06-24  Yusuke Suzuki  <utatane.tea@gmail.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Clean up Object.entries implementation
</span></span></pre></div>
<a id="trunkJSTestsstressdontreservehugecapacitylexerjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/dont-reserve-huge-capacity-lexer.js (0 => 218819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/dont-reserve-huge-capacity-lexer.js                         (rev 0)
+++ trunk/JSTests/stress/dont-reserve-huge-capacity-lexer.js    2017-06-26 19:34:21 UTC (rev 218819)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+var fe="f";                                                                         
+try
+{
+  for (i=0; i<25; i++)                                                   
+    fe += fe;                                                            
+                                                                         
+  var fu=new Function(                                                   
+    fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe,
+    fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe,
+    fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe, fe,
+    fe, fe, fe, fe, fe, fe, fe, fe, fe, fe,                              
+    "done"
+    );
+} catch(e) {
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (218818 => 218819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2017-06-26 19:13:56 UTC (rev 218818)
+++ trunk/Source/JavaScriptCore/ChangeLog       2017-06-26 19:34:21 UTC (rev 218819)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-06-26  Saam Barati  <sbarati@apple.com>
+
+        Crash in JSC::Lexer<unsigned char>::setCode
+        https://bugs.webkit.org/show_bug.cgi?id=172754
+
+        Reviewed by Mark Lam.
+
+        The lexer was asking one of its buffers to reserve initial space that
+        was O(text size in bytes). For large sources, this would end up causing
+        the vector to overflow and crash. This patch changes this code be like
+        the Lexer's other buffers and to only reserve a small starting buffer.
+
+        * parser/Lexer.cpp:
+        (JSC::Lexer<T>::setCode):
+
</ins><span class="cx"> 2017-06-26  Yusuke Suzuki  <utatane.tea@gmail.com>
</span><span class="cx"> 
</span><span class="cx">         [WTF] Drop Thread::create(obsolete things) API since we can use lambda
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (218818 => 218819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp     2017-06-26 19:13:56 UTC (rev 218818)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp        2017-06-26 19:34:21 UTC (rev 218819)
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx">     m_sourceMappingURLDirective = String();
</span><span class="cx">     
</span><span class="cx">     m_buffer8.reserveInitialCapacity(initialReadBufferCapacity);
</span><del>-    m_buffer16.reserveInitialCapacity((m_codeEnd - m_code) / 2);
</del><ins>+    m_buffer16.reserveInitialCapacity(initialReadBufferCapacity);
</ins><span class="cx">     m_bufferForRawTemplateString16.reserveInitialCapacity(initialReadBufferCapacity);
</span><span class="cx">     
</span><span class="cx">     if (LIKELY(m_code < m_codeEnd))
</span></span></pre>
</div>
</div>

</body>
</html>