From 924f4bbd74b6f5060992c15dc6fbdd7ffd9b0e23 Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Fri, 25 Jan 2019 11:03:11 +0100 Subject: [PATCH] Fix the order of value finalizing in ecma_builtin_typedarray_prototype_join (#2726) This patch fixes #2724. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu --- .../ecma-builtin-typedarray-prototype.c | 2 +- .../es2015/regression-test-issue-2724.js | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/jerry/es2015/regression-test-issue-2724.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 7cd12f3a0..937366b3a 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 @@ -1052,9 +1052,9 @@ ecma_builtin_typedarray_prototype_join (ecma_value_t this_arg, /**< this argumen } ecma_free_value (separator_value); + ECMA_OP_TO_NUMBER_FINALIZE (length_number); ecma_free_value (length_value); ecma_free_value (obj_value); - ECMA_OP_TO_NUMBER_FINALIZE (length_number); return ret_value; } /* ecma_builtin_typedarray_prototype_join */ diff --git a/tests/jerry/es2015/regression-test-issue-2724.js b/tests/jerry/es2015/regression-test-issue-2724.js new file mode 100644 index 000000000..47c6c0c9e --- /dev/null +++ b/tests/jerry/es2015/regression-test-issue-2724.js @@ -0,0 +1,22 @@ +// 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 { + var obj = { reverse : Int32Array.prototype.join } ; + Object.defineProperty( obj, 'length', { 'get' : function(toPrecision) { return Object.create(/x/); }}); + obj.reverse("$01$02$11$20"); + assert (false); +} catch (e) { + assert (e instanceof TypeError); +}