archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Release operands properly in opfunc_addition (#2909)

Browse Source 
Right and left value release wasn't complete
Fixes #2901
Fixes #2902

Co-authored-by: Tibor Dusnoki <tdusnoki@inf.u-szeged.hu>
JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu
This commit is contained in:
Szilagyi Adam 2019-06-19 12:29:58 +02:00 committed by Dániel Bátyai
parent 01ecc7bb7b
commit 6e9cf4d459
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jerry-core/vm/opcodes-ecma-arithmetics.c
View File

@ -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;
}
@ -144,8 +152,15 @@ opfunc_addition (ecma_value_t left_value, /**< left value */
ecma_value_t str_right_value = ecma_op_to_string (right_value);
if (ECMA_IS_VALUE_ERROR (str_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;
}

17
tests/jerry/fail/regression-test-issue-2901.js Normal file
View File

@ -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]" )

16
tests/jerry/fail/regression-test-issue-2902.js Normal file
View File

@ -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)};