archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Conditional expression should be parsed as AssignmentExpression (#3610)

Browse Source 
This patch fixes #3553 and fixes #3608.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik 2020-03-16 14:44:39 +01:00 committed by GitHub
parent bfd2639634
commit 1a8276c493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jerry-core/parser/js/js-parser-expr.c
View File

@ -2934,9 +2934,13 @@ parser_parse_initializer_by_next_char (parser_context_t *context_p, /**< context
/**
* Process ternary expression.
*
* @return true - continue with primary expression parsing
* false - otherwise
*/
static void
parser_process_ternary_expression (parser_context_t *context_p) /**< context */
static bool
parser_process_ternary_expression (parser_context_t *context_p, /**< context */
size_t grouping_level) /**< grouping level */
{
JERRY_ASSERT (context_p->token.type == LEXER_QUESTION_MARK);
@ -2978,6 +2982,9 @@ parser_process_ternary_expression (parser_context_t *context_p) /**< context */
/* Last opcode rewrite is not allowed because
* the result may come from the first branch. */
parser_flush_cbc (context_p);
parser_process_binary_opcodes (context_p, 0);
return grouping_level >= PARSER_GROUPING_LEVEL_INCREASE;
} /* parser_process_ternary_expression */
/**
@ -3122,9 +3129,9 @@ process_unary_expression:
}
if (JERRY_UNLIKELY (context_p->token.type == LEXER_QUESTION_MARK)
&& (grouping_level != PARSE_EXPR_LEFT_HAND_SIDE))
&& (grouping_level != PARSE_EXPR_LEFT_HAND_SIDE)
&& parser_process_ternary_expression (context_p, grouping_level))
{
parser_process_ternary_expression (context_p);
continue;
}
break;

22
tests/jerry/regression-test-issue-3553.js Normal file
View File

@ -0,0 +1,22 @@
// 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.
var src = "0?0:0+++++0";
try {
eval (src);
assert (false);
} catch (e) {
assert (e instanceof SyntaxError);
}

22
tests/jerry/regression-test-issue-3608.js Normal file
View File

@ -0,0 +1,22 @@
// 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.
var src = "function $() { return $ ? $ : $ * $++() } switch ($) {}";
try {
eval (src);
assert (false);
} catch (e) {
assert (e instanceof SyntaxError);
}