AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix incorrect asserts in scanner.

Browse Source 
BUG=v8::1126
TEST=test/mjsunit/regress/regress-1126.js

Review URL: http://codereview.chromium.org/6459021

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6701 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
lrn@chromium.org 2011-02-09 14:16:25 +00:00
parent 96c4f62b73
commit d358e2ecd3
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scanner.cc
View File

@ -76,7 +76,8 @@ void BufferedUC16CharacterStream::SlowPushBack(uc16 character) {
buffer_end_ = buffer_ + kBufferSize; buffer_end_ = buffer_ + kBufferSize;
buffer_cursor_ = buffer_end_; buffer_cursor_ = buffer_end_;
} }
ASSERT(pushback_limit_ > buffer_); // Ensure that there is room for at least one pushback.
ASSERT(buffer_cursor_ > buffer_);
ASSERT(pos_ > 0); ASSERT(pos_ > 0);
buffer_[--buffer_cursor_ - buffer_] = character; buffer_[--buffer_cursor_ - buffer_] = character;
if (buffer_cursor_ == buffer_) { if (buffer_cursor_ == buffer_) {
@ -89,15 +90,17 @@ void BufferedUC16CharacterStream::SlowPushBack(uc16 character) {
bool BufferedUC16CharacterStream::ReadBlock() { bool BufferedUC16CharacterStream::ReadBlock() {
buffer_cursor_ = buffer_;
if (pushback_limit_ != NULL) { if (pushback_limit_ != NULL) {
buffer_cursor_ = buffer_; // Leave pushback mode.
buffer_end_ = pushback_limit_; buffer_end_ = pushback_limit_;
pushback_limit_ = NULL; pushback_limit_ = NULL;
ASSERT(buffer_cursor_ != buffer_end_); // If there were any valid characters left at the
return true; // start of the buffer, use those.
if (buffer_cursor_ < buffer_end_) return true;
// Otherwise read a new block.
} }
unsigned length = FillBuffer(pos_, kBufferSize); unsigned length = FillBuffer(pos_, kBufferSize);
buffer_cursor_ = buffer_;
buffer_end_ = buffer_ + length; buffer_end_ = buffer_ + length;
return length > 0; return length > 0;
} }

35
test/mjsunit/regress/regress-1126.js Normal file
View File

@ -0,0 +1,35 @@
// 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.
// This should properly catch the exception from the setter triggered
// by the loaded file, and it should not fail an assertion in debug mode.
try {
eval('--');
assertUnreachable();
} catch (e) {
}