From e21e4a18bade55ba3be2c3eb58e387bba700d300 Mon Sep 17 00:00:00 2001 From: Daniel Balla Date: Fri, 3 Jan 2020 14:18:40 +0100 Subject: [PATCH] Fix freeing `this_arg` in `ecma_builtin_promise_race_or_all` (#3482) Fixes #3478 JerryScript-DCO-1.0-Signed-off-by: Daniel Balla dballa@inf.u-szeged.hu --- .../builtin-objects/ecma-builtin-promise.c | 1 - .../es2015/regression-test-issue-3478.js | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 tests/jerry/es2015/regression-test-issue-3478.js diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c index 367179678..acf29fba4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c @@ -515,7 +515,6 @@ ecma_builtin_promise_race_or_all (ecma_value_t this_arg, /**< 'this' argument */ if (!ecma_is_value_null (species_symbol) && !ecma_is_value_undefined (species_symbol)) { - ecma_free_value (constructor_value); constructor_value = species_symbol; } else diff --git a/tests/jerry/es2015/regression-test-issue-3478.js b/tests/jerry/es2015/regression-test-issue-3478.js new file mode 100644 index 000000000..1e224143c --- /dev/null +++ b/tests/jerry/es2015/regression-test-issue-3478.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. + +Object.prototype["symbol"] = 0; +try { + Promise.race([]); + assert(false); +} catch(e) { + assert(e instanceof TypeError); +}