cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix: unicode characters not allowed in regexes (#7179)

Browse Source 
Issue #6691
This commit is contained in:
Peri Nikhil 2018-01-10 20:03:21 +05:30 committed by Nicolò Ribaudo
parent 26e4911eb2
commit c3352ad2e0
6 changed files with 21 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/babylon/src/tokenizer/index.js
View File

@ -827,13 +827,22 @@ export default class Tokenizer extends LocationParser {
}
const content = this.input.slice(start, this.state.pos);
++this.state.pos;
// Need to use `readWord1` because '\uXXXX' sequences are allowed
// here (don't ask).
const mods = this.readWord1();
if (mods) {
const validFlags = /^[gmsiyu]*$/;
if (!validFlags.test(mods)) {
this.raise(start, "Invalid regular expression flag");
const validFlags = /^[gmsiyu]$/;
let mods = "";
while (this.state.pos < this.input.length) {
const char = this.input[this.state.pos];
const charCode = this.fullCharCodeAtPos();
if (validFlags.test(char)) {
++this.state.pos;
mods += char;
} else if (
isIdentifierChar(charCode) ||
charCode === charCodes.backslash
) {
this.raise(this.state.pos, "Invalid regular expression flag");
} else {
break;
}
}

3
packages/babylon/test/fixtures/core/uncategorised/108/options.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"throws": "Invalid regular expression flag (1:16)"
}

104
packages/babylon/test/fixtures/core/uncategorised/108/output.json vendored
View File

@ -1,104 +0,0 @@
{
"type": "File",
"start": 0,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 22
}
},
"program": {
"type": "Program",
"start": 0,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 22
}
},
"sourceType": "script",
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 22
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 4,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 22
}
},
"id": {
"type": "Identifier",
"start": 4,
"end": 5,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 5
},
"identifierName": "x"
},
"name": "x"
},
"init": {
"type": "RegExpLiteral",
"start": 8,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 8
},
"end": {
"line": 1,
"column": 22
}
},
"extra": {
"raw": "/[P QR]/\\u0067"
},
"pattern": "[P QR]",
"flags": "g"
}
}
],
"kind": "var"
}
],
"directives": []
}
}

2
packages/babylon/test/fixtures/core/uncategorised/366/options.json vendored
View File

@ -1,3 +1,3 @@
{
"throws": "Bad character escape sequence (1:17)"
"throws": "Invalid regular expression flag (1:15)"
}

1
scripts/tests/flow/flow_tests_whitelist.txt
View File

@ -33,7 +33,6 @@ invalid_syntax/migrated_0000.js
invalid_syntax/migrated_0001.js
invalid_syntax/migrated_0002.js
invalid_syntax/migrated_0003.js
invalid_syntax/migrated_0010.js
private_class_properties/valid.js
types/annotations/migrated_0001.js
types/annotations_in_comments_invalid/migrated_0003.js

2
scripts/tests/test262/test262_whitelist.txt
View File

@ -170,8 +170,6 @@ language/import/escaped-from.js(default)
language/import/escaped-from.js(strict mode)
language/literals/regexp/early-err-dup-flag.js(default)
language/literals/regexp/early-err-dup-flag.js(strict mode)
language/literals/regexp/early-err-flags-unicode-escape.js(default)
language/literals/regexp/early-err-flags-unicode-escape.js(strict mode)
language/literals/regexp/early-err-pattern.js(default)
language/literals/regexp/early-err-pattern.js(strict mode)
language/literals/regexp/invalid-braced-quantifier-exact.js(default)