<!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>[159790] 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/159790">159790</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2013-11-26 12:24:58 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in JSC::ASTBuilder::Expression JSC::Parser<JSC::Lexer<unsigned char> >::parseUnaryExpression<JSC::ASTBuilder>(JSC::ASTBuilder&)
https://bugs.webkit.org/show_bug.cgi?id=124886
Reviewed by Sam Weinig.
Source/JavaScriptCore:
Make sure the error macros propagate an existing error before
trying to create a new error message. We need to do this as
the parser state may not be safe for any specific error message
if we are already unwinding due to an error.
* parser/Parser.cpp:
LayoutTests:
Add tests
* js/parser-syntax-check-expected.txt:
* js/script-tests/parser-syntax-check.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsparsersyntaxcheckexpectedtxt">trunk/LayoutTests/js/parser-syntax-check-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsparsersyntaxcheckjs">trunk/LayoutTests/js/script-tests/parser-syntax-check.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159789 => 159790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-11-26 20:11:31 UTC (rev 159789)
+++ trunk/LayoutTests/ChangeLog 2013-11-26 20:24:58 UTC (rev 159790)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-11-26 Oliver Hunt <oliver@apple.com>
+
+ Crash in JSC::ASTBuilder::Expression JSC::Parser<JSC::Lexer<unsigned char> >::parseUnaryExpression<JSC::ASTBuilder>(JSC::ASTBuilder&)
+ https://bugs.webkit.org/show_bug.cgi?id=124886
+
+ Reviewed by Sam Weinig.
+
+ Add tests
+
+ * js/parser-syntax-check-expected.txt:
+ * js/script-tests/parser-syntax-check.js:
+
</ins><span class="cx"> 2013-11-26 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> video.currentSrc should return empty when no resource is loaded
</span></span></pre></div>
<a id="trunkLayoutTestsjsparsersyntaxcheckexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parser-syntax-check-expected.txt (159789 => 159790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parser-syntax-check-expected.txt 2013-11-26 20:11:31 UTC (rev 159789)
+++ trunk/LayoutTests/js/parser-syntax-check-expected.txt 2013-11-26 20:24:58 UTC (rev 159790)
</span><span class="lines">@@ -704,6 +704,32 @@
</span><span class="cx"> PASS Valid: "function f() { ( function(){ return this || eval('this'); }().x = 'y' ) }"
</span><span class="cx"> PASS Invalid: "function(){ return this || eval('this'); }().x = 'y'"
</span><span class="cx"> PASS Invalid: "function f() { function(){ return this || eval('this'); }().x = 'y' }"
</span><ins>+PASS Invalid: "1 % +"
+PASS Invalid: "function f() { 1 % + }"
+PASS Invalid: "1 % -"
+PASS Invalid: "function f() { 1 % - }"
+PASS Invalid: "1 % typeof"
+PASS Invalid: "function f() { 1 % typeof }"
+PASS Invalid: "1 % void"
+PASS Invalid: "function f() { 1 % void }"
+PASS Invalid: "1 % !"
+PASS Invalid: "function f() { 1 % ! }"
+PASS Invalid: "1 % ~"
+PASS Invalid: "function f() { 1 % ~ }"
+PASS Invalid: "1 % delete"
+PASS Invalid: "function f() { 1 % delete }"
+PASS Invalid: "1 % ++"
+PASS Invalid: "function f() { 1 % ++ }"
+PASS Invalid: "1 % --"
+PASS Invalid: "function f() { 1 % -- }"
+PASS Invalid: "1 %
+++"
+PASS Invalid: "function f() { 1 %
+++ }"
+PASS Invalid: "1 %
+--"
+PASS Invalid: "function f() { 1 %
+-- }"
</ins><span class="cx"> PASS e.line is 1
</span><span class="cx"> PASS foo is 'PASS'
</span><span class="cx"> PASS bar is 'PASS'
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparsersyntaxcheckjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parser-syntax-check.js (159789 => 159790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2013-11-26 20:11:31 UTC (rev 159789)
+++ trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2013-11-26 20:24:58 UTC (rev 159790)
</span><span class="lines">@@ -435,6 +435,17 @@
</span><span class="cx"> invalid("({[...x]: 1})")
</span><span class="cx"> valid("( function(){ return this || eval('this'); }().x = 'y' )");
</span><span class="cx"> invalid("function(){ return this || eval('this'); }().x = 'y'");
</span><ins>+invalid("1 % +");
+invalid("1 % -");
+invalid("1 % typeof");
+invalid("1 % void");
+invalid("1 % !");
+invalid("1 % ~");
+invalid("1 % delete");
+invalid("1 % ++");
+invalid("1 % --");
+invalid("1 % \n++");
+invalid("1 % \n--");
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (159789 => 159790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-11-26 20:11:31 UTC (rev 159789)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-11-26 20:24:58 UTC (rev 159790)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-11-26 Oliver Hunt <oliver@apple.com>
+
+ Crash in JSC::ASTBuilder::Expression JSC::Parser<JSC::Lexer<unsigned char> >::parseUnaryExpression<JSC::ASTBuilder>(JSC::ASTBuilder&)
+ https://bugs.webkit.org/show_bug.cgi?id=124886
+
+ Reviewed by Sam Weinig.
+
+ Make sure the error macros propagate an existing error before
+ trying to create a new error message. We need to do this as
+ the parser state may not be safe for any specific error message
+ if we are already unwinding due to an error.
+
+ * parser/Parser.cpp:
+
</ins><span class="cx"> 2013-11-26 Nadav Rotem <nrotem@apple.com>
</span><span class="cx">
</span><span class="cx"> Optimize away OR with zero - a common ASM.js pattern.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (159789 => 159790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2013-11-26 20:11:31 UTC (rev 159789)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2013-11-26 20:24:58 UTC (rev 159790)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #define updateErrorMessage(shouldPrintToken, ...) do {\
</span><ins>+ propagateError(); \
</ins><span class="cx"> logError(shouldPrintToken, __VA_ARGS__); \
</span><span class="cx"> } while (0)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>