From f2ff0d082f0a4dd7d1949736a5f7c2c898c83252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20G=C3=A1l?= Date: Mon, 24 Aug 2020 14:50:18 +0200 Subject: [PATCH] Correctly release values in TypedArray's toLocaleString (#4156) When the `toLocaleString` was called on a TypedArray's value the resulting object's `toString/valueOf` invocations could create errors. These error values were not released. In addition the input element value for the toString operation was released twice in case of an error. Fixes: #4148. JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.usz@partner.samsung.com --- .../ecma-builtin-typedarray-prototype.c | 4 +- .../es.next/regression-test-issue-4148.js | 43 +++++++++++++++++++ tests/test262-esnext-excludelist.xml | 2 - 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 tests/jerry/es.next/regression-test-issue-4148.js diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c index 45f63a008..9733fdcf9 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c @@ -1950,15 +1950,15 @@ ecma_builtin_typedarray_prototype_to_locale_string_helper (ecma_object_t *this_o ecma_string_t *str_p = ecma_op_to_string (call_value); + ecma_free_value (call_value); + if (JERRY_UNLIKELY (str_p == NULL)) { - ecma_free_value (element_value); ecma_deref_object (element_obj_p); return ECMA_VALUE_ERROR; } ret_value = ecma_make_string_value (str_p); - ecma_deref_ecma_string (str_p); } else { diff --git a/tests/jerry/es.next/regression-test-issue-4148.js b/tests/jerry/es.next/regression-test-issue-4148.js new file mode 100644 index 000000000..f745137d8 --- /dev/null +++ b/tests/jerry/es.next/regression-test-issue-4148.js @@ -0,0 +1,43 @@ +// 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 calls = 0; +Number.prototype.toLocaleString = function() { + return { + toString: function() { + calls++; + if (calls > 1) { + throw "ERROR V"; + } + } + }; +}; + +var array = [42.333333, 2.3]; + +var sampleA = new Float32Array(array); +try { + sampleA.toLocaleString(); +} catch(ex) { + assert(ex === "ERROR V"); +} +assert(calls === 2); + +var sampleB = new Uint8Array(array); +try { + sampleB.toLocaleString(); +} catch(ex) { + assert(ex === "ERROR V"); +} +assert(calls === 3); diff --git a/tests/test262-esnext-excludelist.xml b/tests/test262-esnext-excludelist.xml index 54f814cbf..159343f2c 100644 --- a/tests/test262-esnext-excludelist.xml +++ b/tests/test262-esnext-excludelist.xml @@ -2551,8 +2551,6 @@ - -