<!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>[178427] 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/178427">178427</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-01-14 10:48:58 -0800 (Wed, 14 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JavaScript identifier incorrectly parsed if the prefix before an escape sequence is a keyword
https://bugs.webkit.org/show_bug.cgi?id=140420
Reviewed by Oliver Hunt.
Source/JavaScriptCore:
Added new function isIdentPartIncludingEscape() that performs the original
isIdentPart() followed by a check for a valid unicode escape. If there is a
unicode escape, its resolved value is checked with isIdentPart().
* KeywordLookupGenerator.py:
(Trie.printSubTreeAsC):
(Trie.printAsC):
* parser/Lexer.cpp:
(JSC::isUnicodeEscapeIdentPart):
(JSC::isIdentPartIncludingEscape):
LayoutTests:
New regression test.
* js/regress-140420-expected.txt: Added.
* js/regress-140420.html: Added.
* js/script-tests/regress-140420.js: Added.
(with):
(this):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreKeywordLookupGeneratorpy">trunk/Source/JavaScriptCore/KeywordLookupGenerator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress140420expectedtxt">trunk/LayoutTests/js/regress-140420-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress140420html">trunk/LayoutTests/js/regress-140420.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress140420js">trunk/LayoutTests/js/script-tests/regress-140420.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178426 => 178427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-14 18:43:05 UTC (rev 178426)
+++ trunk/LayoutTests/ChangeLog 2015-01-14 18:48:58 UTC (rev 178427)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-14 Michael Saboff <msaboff@apple.com>
+
+ JavaScript identifier incorrectly parsed if the prefix before an escape sequence is a keyword
+ https://bugs.webkit.org/show_bug.cgi?id=140420
+
+ Reviewed by Oliver Hunt.
+
+ New regression test.
+
+ * js/regress-140420-expected.txt: Added.
+ * js/regress-140420.html: Added.
+ * js/script-tests/regress-140420.js: Added.
+ (with):
+ (this):
+
</ins><span class="cx"> 2015-01-14 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Null-deref crash when seeking immediately before looping.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress140420expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-140420-expected.txt (0 => 178427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-140420-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-140420-expected.txt 2015-01-14 18:48:58 UTC (rev 178427)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Regression test for https://webkit.org/b/140420. This test should run without throwing an exception.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress140420html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-140420.html (0 => 178427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-140420.html (rev 0)
+++ trunk/LayoutTests/js/regress-140420.html 2015-01-14 18:48:58 UTC (rev 178427)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-140420.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress140420js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-140420.js (0 => 178427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-140420.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-140420.js 2015-01-14 18:48:58 UTC (rev 178427)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+description(
+"Regression test for https://webkit.org/b/140420. This test should run without throwing an exception."
+);
+
+function with\u00d1i\u00f1a(in\u00c7aVa)
+{
+ return in\u00c7aVa + 1;
+}
+
+function this\u038f\u03c1\u03b1()
+{
+ return\u038f\u03c1\u03b1 = new Date()
+
+ return return\u038f\u03c1\u03b1;
+}
+
+var var\u00c9ternit\u00e9 = with\u00d1i\u00f1a(1000);
+
+var var\u03a4\u03ce\u03c1\u03b1 = this\u038f\u03c1\u03b1();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178426 => 178427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-14 18:43:05 UTC (rev 178426)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-14 18:48:58 UTC (rev 178427)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-14 Michael Saboff <msaboff@apple.com>
+
+ JavaScript identifier incorrectly parsed if the prefix before an escape sequence is a keyword
+ https://bugs.webkit.org/show_bug.cgi?id=140420
+
+ Reviewed by Oliver Hunt.
+
+ Added new function isIdentPartIncludingEscape() that performs the original
+ isIdentPart() followed by a check for a valid unicode escape. If there is a
+ unicode escape, its resolved value is checked with isIdentPart().
+
+ * KeywordLookupGenerator.py:
+ (Trie.printSubTreeAsC):
+ (Trie.printAsC):
+ * parser/Lexer.cpp:
+ (JSC::isUnicodeEscapeIdentPart):
+ (JSC::isIdentPartIncludingEscape):
+
</ins><span class="cx"> 2015-01-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused ResizeImage and DecodeImageData timeline events
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreKeywordLookupGeneratorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/KeywordLookupGenerator.py (178426 => 178427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/KeywordLookupGenerator.py 2015-01-14 18:43:05 UTC (rev 178426)
+++ trunk/Source/JavaScriptCore/KeywordLookupGenerator.py 2015-01-14 18:48:58 UTC (rev 178427)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> str = makePadding(indent)
</span><span class="cx">
</span><span class="cx"> if self.value != None:
</span><del>- print(str + "if (!isIdentPart(code[%d])) {" % (len(self.fullPrefix)))
</del><ins>+ print(str + "if (!isIdentPartIncludingEscape(code+%d, m_codeEnd)) {" % (len(self.fullPrefix)))
</ins><span class="cx"> print(str + " internalShift<%d>();" % len(self.fullPrefix))
</span><span class="cx"> print(str + " if (shouldCreateIdentifier)")
</span><span class="cx"> print(str + (" data->ident = &m_vm->propertyNames->%sKeyword;" % self.fullPrefix))
</span><span class="lines">@@ -184,8 +184,8 @@
</span><span class="cx"> def printAsC(self):
</span><span class="cx"> print("namespace JSC {")
</span><span class="cx"> print("")
</span><del>- print("static ALWAYS_INLINE bool isIdentPart(LChar c);")
- print("static ALWAYS_INLINE bool isIdentPart(UChar c);")
</del><ins>+ print("static ALWAYS_INLINE bool isIdentPartIncludingEscape(const LChar* code, const LChar* codeEnd);")
+ print("static ALWAYS_INLINE bool isIdentPartIncludingEscape(const UChar* code, const UChar* codeEnd);")
</ins><span class="cx"> # max length + 1 so we don't need to do any bounds checking at all
</span><span class="cx"> print("static const int maxTokenLength = %d;" % (self.maxLength() + 1))
</span><span class="cx"> print("")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (178426 => 178427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp 2015-01-14 18:43:05 UTC (rev 178426)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp 2015-01-14 18:48:58 UTC (rev 178427)
</span><span class="lines">@@ -681,6 +681,36 @@
</span><span class="cx"> return isLatin1(c) ? isIdentPart(static_cast<LChar>(c)) : isNonLatin1IdentPart(c);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template <typename T>
+bool isUnicodeEscapeIdentPart(const T* code)
+{
+ T char1 = code[0];
+ T char2 = code[1];
+ T char3 = code[2];
+ T char4 = code[3];
+
+ if (!isASCIIHexDigit(char1) || !isASCIIHexDigit(char2) || !isASCIIHexDigit(char3) || !isASCIIHexDigit(char4))
+ return false;
+
+ return isIdentPart(Lexer<T>::convertUnicode(char1, char2, char3, char4));
+}
+
+static ALWAYS_INLINE bool isIdentPartIncludingEscape(const LChar* code, const LChar* codeEnd)
+{
+ if (isIdentPart(*code))
+ return true;
+
+ return (*code == '\\' && ((codeEnd - code) >= 6) && code[1] == 'u' && isUnicodeEscapeIdentPart(code+2));
+}
+
+static ALWAYS_INLINE bool isIdentPartIncludingEscape(const UChar* code, const UChar* codeEnd)
+{
+ if (isIdentPart(*code))
+ return true;
+
+ return (*code == '\\' && ((codeEnd - code) >= 6) && code[1] == 'u' && isUnicodeEscapeIdentPart(code+2));
+}
+
</ins><span class="cx"> static inline LChar singleEscape(int c)
</span><span class="cx"> {
</span><span class="cx"> if (c < 128) {
</span></span></pre>
</div>
</div>
</body>
</html>