Skip to content
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

Jump to bottom

fix: disallow \8, \9 in strict mode string #11852

Merged
merged 1 commit into from Jul 21, 2020
Merged

fix: disallow \8, \9 in strict mode string #11852

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/babel-parser/src/parser/error-message.js
View file
Open in desktop
Expand Up @@ -139,6 +139,7 @@ export const ErrorMessages = Object.freeze({
StrictEvalArgumentsBinding: "Binding '%0' in strict mode",
StrictFunction:
"In strict mode code, functions can only be declared at top level or inside a block",
StrictNumericEscape: "The only valid numeric escape in strict mode is '\\0'",
StrictOctalLiteral: "Legacy octal literals are not allowed in strict mode",
StrictWith: "'with' in strict mode",
SuperNotAllowed:
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-parser/src/tokenizer/index.js
View file
Open in desktop
Expand Up @@ -1362,6 +1362,8 @@ export default class Tokenizer extends ParserErrors {
case charCodes.digit9:
if (inTemplate) {
return null;
} else if (this.state.strict) {
this.raise(this.state.pos - 1, Errors.StrictNumericEscape);
}
// fall through
default:
Expand Down Expand Up @@ -1390,7 +1392,7 @@ export default class Tokenizer extends ParserErrors {
if (inTemplate) {
return null;
} else if (this.state.strict) {
this.raise(codePos, Errors.StrictOctalLiteral);
this.raise(codePos, Errors.StrictNumericEscape);
} else {
// This property is used to throw an error for
// an octal literal in a directive that occurs prior
Expand Down
0 ...-octal-strict-directive-function/input.js → ...-octal-strict-directive-function/input.js
View file
Open in desktop
File renamed without changes.
0 ...al-strict-directive-function/options.json → ...al-strict-directive-function/options.json
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...tal-strict-directive-function/output.json → ...tal-strict-directive-function/output.json
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
"SyntaxError: Legacy octal literals are not allowed in strict mode (2:4)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (7:4)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (8:4)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (14:4)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (19:4)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (20:4)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (14:4)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (19:4)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (20:4)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (25:2)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (30:2)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (31:2)"
Expand Down
0 ...n/invalid-octal-strict-directive/input.js → ...g/invalid-octal-strict-directive/input.js
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...nvalid-octal-strict-directive/output.json → ...nvalid-octal-strict-directive/output.json
View file
Open in desktop
Expand Up @@ -2,13 +2,13 @@
"type": "File",
"start":0,"end":96,"loc":{"start":{"line":1,"column":0},"end":{"line":14,"column":22}},
"errors": [
"SyntaxError: Legacy octal literals are not allowed in strict mode (8:2)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (9:2)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (8:2)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (9:2)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (11:0)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (12:0)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (14:2)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (14:10)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (14:18)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (14:2)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (14:10)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (14:18)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:2)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:10)",
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:18)",
Expand Down
5 changes: 5 additions & 0 deletions packages/babel-parser/test/fixtures/core/escape-string/non-octal-eight-and-nine/input.js
View file
Open in desktop
@@ -0,0 +1,5 @@
"\8","\9";
() => {
"use strict";
"\8", "\9";
}
106 changes: 106 additions & 0 deletions packages/babel-parser/test/fixtures/core/escape-string/non-octal-eight-and-nine/output.json
View file
Open in desktop
@@ -0,0 +1,106 @@
{
"type": "File",
"start":0,"end":50,"loc":{"start":{"line":1,"column":0},"end":{"line":5,"column":1}},
"errors": [
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (4:4)",
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (4:10)"
],
"program": {
"type": "Program",
"start":0,"end":50,"loc":{"start":{"line":1,"column":0},"end":{"line":5,"column":1}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":10,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":10}},
"expression": {
"type": "SequenceExpression",
"start":0,"end":9,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":9}},
"expressions": [
{
"type": "StringLiteral",
"start":0,"end":4,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":4}},
"extra": {
"rawValue": "8",
"raw": "\"\\8\""
},
"value": "8"
},
{
"type": "StringLiteral",
"start":5,"end":9,"loc":{"start":{"line":1,"column":5},"end":{"line":1,"column":9}},
"extra": {
"rawValue": "9",
"raw": "\"\\9\""
},
"value": "9"
}
]
}
},
{
"type": "ExpressionStatement",
"start":11,"end":50,"loc":{"start":{"line":2,"column":0},"end":{"line":5,"column":1}},
"expression": {
"type": "ArrowFunctionExpression",
"start":11,"end":50,"loc":{"start":{"line":2,"column":0},"end":{"line":5,"column":1}},
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":17,"end":50,"loc":{"start":{"line":2,"column":6},"end":{"line":5,"column":1}},
"body": [
{
"type": "ExpressionStatement",
"start":37,"end":48,"loc":{"start":{"line":4,"column":2},"end":{"line":4,"column":13}},
"expression": {
"type": "SequenceExpression",
"start":37,"end":47,"loc":{"start":{"line":4,"column":2},"end":{"line":4,"column":12}},
"expressions": [
{
"type": "StringLiteral",
"start":37,"end":41,"loc":{"start":{"line":4,"column":2},"end":{"line":4,"column":6}},
"extra": {
"rawValue": "8",
"raw": "\"\\8\""
},
"value": "8"
},
{
"type": "StringLiteral",
"start":43,"end":47,"loc":{"start":{"line":4,"column":8},"end":{"line":4,"column":12}},
"extra": {
"rawValue": "9",
"raw": "\"\\9\""
},
"value": "9"
}
]
}
}
],
"directives": [
{
"type": "Directive",
"start":21,"end":34,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":15}},
"value": {
"type": "DirectiveLiteral",
"start":21,"end":33,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":14}},
"value": "use strict",
"extra": {
"raw": "\"use strict\"",
"rawValue": "use strict"
}
}
}
]
}
}
}
],
"directives": []
}
}
0 .../fixtures/core/uncategorised/503/input.js → ...ring/numeric-escape-in-directive/input.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...xtures/core/uncategorised/503/output.json → ...g/numeric-escape-in-directive/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"type": "File",
"start":0,"end":76,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":76}},
"errors": [
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:69)"
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (1:69)"
],
"program": {
"type": "Program",
Expand Down
0 .../fixtures/core/uncategorised/501/input.js → .../numeric-escape-in-property-name/input.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...xtures/core/uncategorised/501/output.json → ...meric-escape-in-property-name/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"type": "File",
"start":0,"end":50,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":50}},
"errors": [
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:38)"
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (1:38)"
],
"program": {
"type": "Program",
Expand Down
0 .../fixtures/core/uncategorised/499/input.js → ...ore/escape-string/numeric-escape/input.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...xtures/core/uncategorised/499/output.json → .../escape-string/numeric-escape/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"type": "File",
"start":0,"end":40,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":40}},
"errors": [
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:35)"
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (1:35)"
],
"program": {
"type": "Program",
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0217/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"type": "File",
"start":0,"end":40,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":40}},
"errors": [
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:35)"
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (1:35)"
],
"program": {
"type": "Program",
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0219/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"type": "File",
"start":0,"end":50,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":50}},
"errors": [
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:38)"
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (1:38)"
],
"program": {
"type": "Program",
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0223/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
"type": "File",
"start":0,"end":76,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":76}},
"errors": [
"SyntaxError: Legacy octal literals are not allowed in strict mode (1:69)"
"SyntaxError: The only valid numeric escape in strict mode is '\\0' (1:69)"
],
"program": {
"type": "Program",
Expand Down