From 49ef5498075fbc2ce09dbfa76ecb51b39464df10 Mon Sep 17 00:00:00 2001 From: caitpotter88 Date: Wed, 4 Feb 2015 13:05:33 -0800 Subject: [PATCH] templates: Don't check IsLineTerminator() if character is negative BUG=455212 LOG=N R=arv@chromium.org Review URL: https://codereview.chromium.org/902703002 Cr-Commit-Position: refs/heads/master@{#26442} --- src/scanner.cc | 2 +- test/mjsunit/regress/regress-455212.js | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-455212.js diff --git a/src/scanner.cc b/src/scanner.cc index ea8586e..de1b8e8 100644 --- a/src/scanner.cc +++ b/src/scanner.cc @@ -843,7 +843,7 @@ Token::Value Scanner::ScanTemplateSpan() { ReduceRawLiteralLength(2); break; } else if (c == '\\') { - if (unicode_cache_->IsLineTerminator(c0_)) { + if (c0_ > 0 && unicode_cache_->IsLineTerminator(c0_)) { // The TV of LineContinuation :: \ LineTerminatorSequence is the empty // code unit sequence. uc32 lastChar = c0_; diff --git a/test/mjsunit/regress/regress-455212.js b/test/mjsunit/regress/regress-455212.js new file mode 100644 index 0000000..f2fd033 --- /dev/null +++ b/test/mjsunit/regress/regress-455212.js @@ -0,0 +1,33 @@ +// Copyright 2008 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Typeof expression must resolve to 'undefined' when it used on a +// non-existing property. It is *not* allowed to throw a +// ReferenceError. + +// eval("\u0060\u005c") is an unterminated template string (\u0060) +assertThrows("\u0060\u005c", SyntaxError); -- 2.7.4