Skip to content

v8: fix template literal NULL pointer deref #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoordhuis merged 1 commit into from
Jan 21, 2015
Merged

v8: fix template literal NULL pointer deref #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions deps/v8/src/preparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2875,11 +2875,17 @@ ParserBase<Traits>::ParseTemplateLiteral(ExpressionT tag, int start, bool* ok) {

do {
next = peek();
if (!next) {
if (next == Token::EOS) {
ReportMessageAt(Scanner::Location(start, peek_position()),
"unterminated_template");
*ok = false;
return Traits::EmptyExpression();
} else if (next == Token::ILLEGAL) {
Traits::ReportMessageAt(
Scanner::Location(position() + 1, peek_position()),
"unexpected_token", "ILLEGAL", false);
*ok = false;
return Traits::EmptyExpression();
}

int expr_pos = peek_position();
Expand All @@ -2898,11 +2904,17 @@ ParserBase<Traits>::ParseTemplateLiteral(ExpressionT tag, int start, bool* ok) {
next = scanner()->ScanTemplateContinuation();
Next();

if (!next) {
ReportMessageAt(Scanner::Location(start, position()),
if (next == Token::EOS) {
ReportMessageAt(Scanner::Location(start, peek_position()),
"unterminated_template");
*ok = false;
return Traits::EmptyExpression();
} else if (next == Token::ILLEGAL) {
Traits::ReportMessageAt(
Scanner::Location(position() + 1, peek_position()),
"unexpected_token", "ILLEGAL", false);
*ok = false;
return Traits::EmptyExpression();
}

Traits::AddTemplateSpan(&ts, next == Token::TEMPLATE_TAIL);
Expand Down
22 changes: 22 additions & 0 deletions deps/v8/test/cctest/test-parsing.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4549,6 +4549,28 @@ TEST(ScanUnterminatedTemplateLiterals) {
}


TEST(TemplateLiteralsIllegalTokens) {
const char* context_data[][2] = {{"'use strict';", ""},
{"function foo(){ 'use strict';"
" var a, b, c; return ", "}"},
{NULL, NULL}};
const char* data[] = {
"`hello\\x`",
"`hello\\x${1}`",
"`hello${1}\\x`",
"`hello${1}\\x${2}`",
"`hello\\x\n`",
"`hello\\x\n${1}`",
"`hello${1}\\x\n`",
"`hello${1}\\x\n${2}`",
NULL};

static const ParserFlag always_flags[] = {kAllowHarmonyTemplates};
RunParserSyncTest(context_data, data, kError, NULL, 0, always_flags,
arraysize(always_flags));
}


TEST(LexicalScopingSloppyMode) {
const char* context_data[][2] = {
{"", ""},
Expand Down