From b69f3fd0ff8bda71b7ded7cf55cae77b9c535236 Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Wed, 2 Jan 2019 12:56:02 +0100 Subject: [PATCH] Add missing error check after vm_op_get_value (#2655) This patch fixes #2654. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu --- jerry-core/vm/vm.c | 11 +++++++---- tests/jerry/fail/regression-test-issue-2654.js | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 tests/jerry/fail/regression-test-issue-2654.js diff --git a/jerry-core/vm/vm.c b/jerry-core/vm/vm.c index f6c06b762..16468b3a9 100644 --- a/jerry-core/vm/vm.c +++ b/jerry-core/vm/vm.c @@ -1725,12 +1725,15 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ { left_value = ECMA_VALUE_UNDEFINED; right_value = ECMA_VALUE_UNDEFINED; + } - if (ECMA_IS_VALUE_ERROR (result)) - { - goto error; - } + if (ECMA_IS_VALUE_ERROR (result)) + { + goto error; + } + if (opcode < CBC_PRE_INCR) + { break; } diff --git a/tests/jerry/fail/regression-test-issue-2654.js b/tests/jerry/fail/regression-test-issue-2654.js new file mode 100644 index 000000000..d36ce0362 --- /dev/null +++ b/tests/jerry/fail/regression-test-issue-2654.js @@ -0,0 +1,15 @@ +// 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. + +--null.static ? this : [ , ] instanceof true;