From e70cfed57a115d3b60727df766972dbb228a0e7f Mon Sep 17 00:00:00 2001 From: Szilagyi Adam Date: Fri, 6 Dec 2019 13:33:41 +0100 Subject: [PATCH] Add bounds check for copyWithin (#3425) When inputs are out of bounds, we don't need to do anything in the operation. Fixes #3408 JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu --- .../ecma-builtin-array-prototype.c | 6 ++++++ .../jerry/es2015/regression-test-issue-3408.js | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 tests/jerry/es2015/regression-test-issue-3408.js diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c index 2bc3e8f3e..53bfa4a74 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c @@ -2338,6 +2338,12 @@ ecma_builtin_array_prototype_object_copy_within (const ecma_value_t args[], /**< } } + if (target >= len || start >= end || end == 0) + { + ecma_ref_object (obj_p); + return ecma_make_object_value (obj_p); + } + uint32_t count = JERRY_MIN (end - start, len - target); bool forward = true; diff --git a/tests/jerry/es2015/regression-test-issue-3408.js b/tests/jerry/es2015/regression-test-issue-3408.js new file mode 100644 index 000000000..0398d7aaa --- /dev/null +++ b/tests/jerry/es2015/regression-test-issue-3408.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 array = [0, 0, obj, 0, 0]; +array.copyWithin(NaN, 67, 0); +var obj