diff --git a/jerry-core/vm/opcodes-ecma-arithmetics.c b/jerry-core/vm/opcodes-ecma-arithmetics.c index 96412bd0a..68892768d 100644 --- a/jerry-core/vm/opcodes-ecma-arithmetics.c +++ b/jerry-core/vm/opcodes-ecma-arithmetics.c @@ -136,6 +136,14 @@ opfunc_addition (ecma_value_t left_value, /**< left value */ if (ECMA_IS_VALUE_ERROR (str_left_value)) { + if (free_left_value) + { + ecma_free_value (left_value); + } + if (free_right_value) + { + ecma_free_value (right_value); + } return str_left_value; } @@ -145,7 +153,14 @@ opfunc_addition (ecma_value_t left_value, /**< left value */ if (ECMA_IS_VALUE_ERROR (str_right_value)) { - ecma_free_value (right_value); + if (free_right_value) + { + ecma_free_value (right_value); + } + if (free_left_value) + { + ecma_free_value (left_value); + } ecma_deref_ecma_string (string1_p); return str_right_value; } diff --git a/tests/jerry/fail/regression-test-issue-2901.js b/tests/jerry/fail/regression-test-issue-2901.js new file mode 100644 index 000000000..45c2a01a8 --- /dev/null +++ b/tests/jerry/fail/regression-test-issue-2901.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. + +object = new Object ( ) +var str = Symbol ( 'foo' ) +assert ( object + str === "[object Object]" ) diff --git a/tests/jerry/fail/regression-test-issue-2902.js b/tests/jerry/fail/regression-test-issue-2902.js new file mode 100644 index 000000000..0d9c69bed --- /dev/null +++ b/tests/jerry/fail/regression-test-issue-2902.js @@ -0,0 +1,16 @@ +// 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 b = Symbol.for(); +for (var $;;) {$ = $("" + b)};