From 072aedb4efc259f05e29e43f23ca324bb18febed Mon Sep 17 00:00:00 2001 From: Szilagyi Adam Date: Mon, 28 Oct 2019 14:23:53 +0100 Subject: [PATCH] Fix wrong error handling in ecma_builtin_function_helper_get_function_arguments (#3257) Fixes #3252 JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu --- .../builtin-objects/ecma-builtin-function.c | 5 +---- .../es2015/regression-test-issue-3252.js | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 tests/jerry/es2015/regression-test-issue-3252.js diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-function.c index 52468255e..b0ed4649c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function.c @@ -98,10 +98,7 @@ ecma_builtin_function_helper_get_function_arguments (const ecma_value_t *argumen if (JERRY_UNLIKELY (new_str_p == NULL)) { ecma_deref_ecma_string (final_str_p); - - /* Return with the error. */ - final_str_p = new_str_p; - break; + return ECMA_VALUE_ERROR; } final_str_p = ecma_append_magic_string_to_string (final_str_p, diff --git a/tests/jerry/es2015/regression-test-issue-3252.js b/tests/jerry/es2015/regression-test-issue-3252.js new file mode 100644 index 000000000..28fded4f9 --- /dev/null +++ b/tests/jerry/es2015/regression-test-issue-3252.js @@ -0,0 +1,21 @@ +// 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. + +try { + function NoParent ( ) { } + Number.constructor( NoParent, Symbol.hasInstance, { }) + assert (false) +} catch (e) { + assert (e instanceof TypeError); +}