From 59eb0787bad14e17baff394b19ac13034d20d8fe Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Wed, 4 Dec 2019 14:13:43 +0100 Subject: [PATCH] Fix global error management in ecma_builtin_string_prototype_object_split (#3414) This patch fixes #3395. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu --- .../ecma-builtin-string-prototype.c | 2 ++ .../jerry/es2015/regresssion-test-issue-3395.js | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 tests/jerry/es2015/regresssion-test-issue-3395.js diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c index 3525013f0..25f3ba47c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c @@ -902,6 +902,7 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_to_string_val, /** if (ECMA_IS_VALUE_ERROR (match_result)) { match_result = JERRY_CONTEXT (error_value); + JERRY_CONTEXT (status_flags) &= (uint32_t) ~ECMA_STATUS_EXCEPTION; } ecma_free_value (match_result); @@ -991,6 +992,7 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_to_string_val, /** if (ECMA_IS_VALUE_ERROR (match_result)) { ecma_free_value (JERRY_CONTEXT (error_value)); + JERRY_CONTEXT (status_flags) &= (uint32_t) ~ECMA_STATUS_EXCEPTION; } } else diff --git a/tests/jerry/es2015/regresssion-test-issue-3395.js b/tests/jerry/es2015/regresssion-test-issue-3395.js new file mode 100644 index 000000000..a0855bf77 --- /dev/null +++ b/tests/jerry/es2015/regresssion-test-issue-3395.js @@ -0,0 +1,16 @@ +// 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. + +for (var [] of [[], []]) + String.prototype.split(RegExp.prototype)