Skip to content

fix(parser): do not crash on untokenizable quote prefixes #5486

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

Closed
yjbanov wants to merge 1 commit into from
Closed

fix(parser): do not crash on untokenizable quote prefixes #5486

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
12 changes: 12 additions & 0 deletions modules/angular2/src/core/change_detection/parser/lexer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,18 @@ function isIdentifierStart(code: number): boolean {
return ($a <= code && code <= $z) || ($A <= code && code <= $Z) || (code == $_) || (code == $$);
}

export function isIdentifier(input: string): boolean {
if (input.length == 0) return false;
var scanner = new _Scanner(input);
if (!isIdentifierStart(scanner.peek)) return false;
scanner.advance();
while (scanner.peek !== $EOF) {
if (!isIdentifierPart(scanner.peek)) return false;
scanner.advance();
}
return true;
}

function isIdentifierPart(code: number): boolean {
return ($a <= code && code <= $z) || ($A <= code && code <= $Z) || ($0 <= code && code <= $9) ||
(code == $_) || (code == $$);
Expand Down
12 changes: 4 additions & 8 deletions modules/angular2/src/core/change_detection/parser/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {ListWrapper} from 'angular2/src/facade/collection';
import {
Lexer,
EOF,
isIdentifier,
Token,
$PERIOD,
$COLON,
Expand Down Expand Up @@ -105,15 +106,10 @@ export class Parser {
if (isBlank(input)) return null;
var prefixSeparatorIndex = input.indexOf(':');
if (prefixSeparatorIndex == -1) return null;
var prefix = input.substring(0, prefixSeparatorIndex);
var prefix = input.substring(0, prefixSeparatorIndex).trim();
if (!isIdentifier(prefix)) return null;
var uninterpretedExpression = input.substring(prefixSeparatorIndex + 1);

// while we do not interpret the expression, we do interpret the prefix
var prefixTokens = this._lexer.tokenize(prefix);

// quote prefix must be a single legal identifier
if (prefixTokens.length != 1 || !prefixTokens[0].isIdentifier()) return null;
return new Quote(prefixTokens[0].strValue, uninterpretedExpression, location);
return new Quote(prefix, uninterpretedExpression, location);
}

parseTemplateBindings(input: string, location: any): TemplateBinding[] {
Expand Down
3 changes: 3 additions & 0 deletions modules/angular2/test/core/change_detection/parser/parser_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ export function main() {

it('should parse quoted expressions', () => { checkBinding('a:b', 'a:b'); });

it('should not crash when prefix part is not tokenizable',
() => { checkBinding('"a:b"', '"a:b"'); });

it('should ignore whitespace around quote prefix', () => { checkBinding(' a :b', 'a:b'); });

it('should refuse prefixes that are not single identifiers', () => {
Expand Down