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

Fix parsing function statements containing invalid tokens (#3838)

Browse Source 
Fixes #3821.

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
Dániel Bátyai
2020-06-04 11:25:25 +02:00
committed by GitHub
parent fe09200d61
commit 1322e08ac2
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-parser-statm.c
+2 -4
View File
@@ -710,9 +710,9 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */
&& context_p->token.lit_location.type == LEXER_IDENT_LITERAL); && context_p->token.lit_location.type == LEXER_IDENT_LITERAL);
#if ENABLED (JERRY_ES2015) #if ENABLED (JERRY_ES2015)
if (context_p->next_scanner_info_p->source_p == context_p->source_p) if (context_p->next_scanner_info_p->source_p == context_p->source_p
&& context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED)
{ {
JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED);
parser_raise_error (context_p, PARSER_ERR_VARIABLE_REDECLARED); parser_raise_error (context_p, PARSER_ERR_VARIABLE_REDECLARED);
} }
#endif /* ENABLED (JERRY_ES2015) */ #endif /* ENABLED (JERRY_ES2015) */
@@ -730,8 +730,6 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */
status_flags |= PARSER_HAS_NON_STRICT_ARG; status_flags |= PARSER_HAS_NON_STRICT_ARG;
} }
JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION);
#if ENABLED (JERRY_ES2015) #if ENABLED (JERRY_ES2015)
if (is_generator_function) if (is_generator_function)
{ {
tests/jerry/regression-test-issue-3821.js
+35
View File
@@ -0,0 +1,35 @@
// 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 check_syntax_error (script)
{
try
{
eval (script);
assert (false);
}
catch (e)
{
assert (e instanceof SyntaxError);
}
}
check_syntax_error ('function')
check_syntax_error ('function a')
check_syntax_error ('function a"')
check_syntax_error ('function a"b')
check_syntax_error ('function a("b')
check_syntax_error ('function a(b, "c')
check_syntax_error ('function a(b, c"d')
check_syntax_error ('function a(b, c)"d')