From 32de38198a5186a25c369c4cd1991925958edb46 Mon Sep 17 00:00:00 2001 From: Zoltan Herczeg Date: Mon, 28 Sep 2020 10:48:14 +0200 Subject: [PATCH] Fix invalid free in TypedArray find method. (#4230) JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com --- .../ecma-builtin-typedarray-prototype.c | 5 +++-- .../jerry/es.next/regression-test-issue-4213.js | 17 +++++++++++++++++ tests/test262-esnext-excludelist.xml | 3 --- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 tests/jerry/es.next/regression-test-issue-4213.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 3f840bce6..4e8f2fe96 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 @@ -1237,10 +1237,9 @@ ecma_builtin_typedarray_prototype_find_helper (ecma_value_t this_arg, /**< this ecma_value_t call_args[] = { element_value, ecma_make_uint32_value (buffer_index), this_arg }; ecma_value_t call_value = ecma_op_function_call (func_object_p, predicate_this_arg, call_args, 3); - ecma_free_value (element_value); - if (ECMA_IS_VALUE_ERROR (call_value)) { + ecma_free_value (element_value); return call_value; } @@ -1254,10 +1253,12 @@ ecma_builtin_typedarray_prototype_find_helper (ecma_value_t this_arg, /**< this return element_value; } + ecma_free_value (element_value); return ecma_make_uint32_value (buffer_index); } buffer_index++; + ecma_free_value (element_value); } return is_find ? ECMA_VALUE_UNDEFINED : ecma_make_integer_value (-1); diff --git a/tests/jerry/es.next/regression-test-issue-4213.js b/tests/jerry/es.next/regression-test-issue-4213.js new file mode 100644 index 000000000..322589e78 --- /dev/null +++ b/tests/jerry/es.next/regression-test-issue-4213.js @@ -0,0 +1,17 @@ +// 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 arr = new BigInt64Array([39n]); + +var result = arr.find(function() { return true; }); diff --git a/tests/test262-esnext-excludelist.xml b/tests/test262-esnext-excludelist.xml index d498d2b4b..cac14f530 100644 --- a/tests/test262-esnext-excludelist.xml +++ b/tests/test262-esnext-excludelist.xml @@ -1649,10 +1649,7 @@ - - -