From 61ae1be60927ac80d58fa93b3c50fac8618cf58e Mon Sep 17 00:00:00 2001 From: "lrn@chromium.org" Date: Fri, 5 Aug 2011 11:21:04 +0000 Subject: [PATCH] Fix bug in scanner. Checking for end-of-comment truncated to byte before comparing to '*'. BUG=v8:1546 TEST=mjsunit/regress/regress-1546 Review URL: http://codereview.chromium.org/7585004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8842 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/scanner-base.cc | 2 +- test/mjsunit/regress/regress-1546.js | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-1546.js diff --git a/src/scanner-base.cc b/src/scanner-base.cc index 16f8db5..05e4042 100644 --- a/src/scanner-base.cc +++ b/src/scanner-base.cc @@ -171,7 +171,7 @@ Token::Value JavaScriptScanner::SkipMultiLineComment() { Advance(); while (c0_ >= 0) { - char ch = c0_; + uc32 ch = c0_; Advance(); if (unicode_cache_->IsLineTerminator(ch)) { // Following ECMA-262, section 7.4, a comment containing diff --git a/test/mjsunit/regress/regress-1546.js b/test/mjsunit/regress/regress-1546.js new file mode 100644 index 0000000..7f1fa58 --- /dev/null +++ b/test/mjsunit/regress/regress-1546.js @@ -0,0 +1,32 @@ +// Copyright 2011 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. + +// See: http://code.google.com/p/v8/issues/detail?id=1546 + +// Should't throw. Scanner incorrectly truncated to char before comparing +// with "*", so it ended the comment early. +eval("/*\u822a/ */"); \ No newline at end of file -- 2.7.4