Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1083913: Restrict source lines included in error messages to the source text actually available. r=shu

Browse Source
This commit is contained in:
Jim Blandy 2014-11-12 14:51:42 -08:00
parent 155ef09737
commit e780473752
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/frontend/TokenStream.cpp
View File

@ -696,6 +696,11 @@ TokenStream::reportCompileErrorNumberVA(uint32_t offset, unsigned flags, unsigne
offset - windowRadius :
linebase;
// The window must start within the portion of the current line
// that we actually have in our buffer.
if (windowStart < userbuf.startOffset())
windowStart = userbuf.startOffset();
// The window must end within the current line, no later than
// windowRadius after offset.
size_t windowEnd = userbuf.findEOLMax(offset, windowRadius);

20
js/src/frontend/TokenStream.h
View File

@ -667,7 +667,7 @@ class MOZ_STACK_CLASS TokenStream
public:
TokenBuf(ExclusiveContext *cx, const char16_t *buf, size_t length, size_t startOffset)
: base_(buf),
startOffset(startOffset),
startOffset_(startOffset),
limit_(buf + length),
ptr(buf)
{ }
@ -680,14 +680,18 @@ class MOZ_STACK_CLASS TokenStream
return offset() == 0;
}
size_t startOffset() const {
return startOffset_;
}
size_t offset() const {
return startOffset + mozilla::PointerRangeSize(base_, ptr);
return startOffset_ + mozilla::PointerRangeSize(base_, ptr);
}
const char16_t *rawCharPtrAt(size_t offset) const {
MOZ_ASSERT(startOffset <= offset);
MOZ_ASSERT(offset - startOffset <= mozilla::PointerRangeSize(base_, limit_));
return base_ + (offset - startOffset);
MOZ_ASSERT(startOffset_ <= offset);
MOZ_ASSERT(offset - startOffset_ <= mozilla::PointerRangeSize(base_, limit_));
return base_ + (offset - startOffset_);
}
const char16_t *limit() const {
@ -747,12 +751,12 @@ class MOZ_STACK_CLASS TokenStream
}
// Returns the offset of the next EOL, but stops once 'max' characters
// have been scanned (*including* the char at startOffset).
size_t findEOLMax(size_t startOffset, size_t max);
// have been scanned (*including* the char at startOffset_).
size_t findEOLMax(size_t start, size_t max);
private:
const char16_t *base_; // base of buffer
uint32_t startOffset; // offset of base_[0]
uint32_t startOffset_; // offset of base_[0]
const char16_t *limit_; // limit for quick bounds check
const char16_t *ptr; // next char to get
};

7
js/src/jit-test/tests/parser/columnNumber.js
View File

@ -36,3 +36,10 @@ assertEq(evaluate("saveStack().column", { columnNumber: maxColumn }),
// column encoding.
assertEq(evaluate(" saveStack().column", { columnNumber: maxColumn }),
0);
// Gathering source text for inclusion in error messages should not try to reach
// outside the buffer to find the start of the source line. The below should
// report the error without crashing.
assertThrowsInstanceOf(() => evaluate("function x(y,y) { 'use strict'; } x()",
{ columnNumber: 10 }),
SyntaxError);