YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check next token before reparsing identifiers in object assignments. (#3756)

Browse Source 
Fixes #3735.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg
2020-05-18 13:16:16 +02:00
committed by GitHub
parent c4d5c2c9e1
commit e01cfda0b8
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-parser-expr.c
+11 -5
View File
@@ -3075,14 +3075,20 @@ parser_parse_object_initializer (parser_context_t *context_p, /**< context */
parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED); parser_raise_error (context_p, PARSER_ERR_COLON_EXPECTED);
} }
if (context_p->token.type == LEXER_RIGHT_BRACE if (context_p->token.type != LEXER_RIGHT_BRACE
|| context_p->token.type == LEXER_ASSIGN && context_p->token.type != LEXER_ASSIGN
|| context_p->token.type == LEXER_COMMA) && context_p->token.type != LEXER_COMMA)
{ {
parser_reparse_as_common_identifier (context_p, start_line, start_column); parser_raise_error (context_p, PARSER_ERR_OBJECT_ITEM_SEPARATOR_EXPECTED);
lexer_next_token (context_p);
} }
parser_reparse_as_common_identifier (context_p, start_line, start_column);
lexer_next_token (context_p);
JERRY_ASSERT (context_p->token.type == LEXER_RIGHT_BRACE
|| context_p->token.type == LEXER_ASSIGN
|| context_p->token.type == LEXER_COMMA);
if (flags & PARSER_PATTERN_ARGUMENTS) if (flags & PARSER_PATTERN_ARGUMENTS)
{ {
if (context_p->lit_object.literal_p->status_flags & LEXER_FLAG_FUNCTION_ARGUMENT) if (context_p->lit_object.literal_p->status_flags & LEXER_FLAG_FUNCTION_ARGUMENT)
tests/jerry/fail/regression-test-issue-3735.js
+15
View File
@@ -0,0 +1,15 @@
// Copyright JS Foundation and other contributors, http://js.foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
function $({ $ $() {}