From 9fcf6597f6942146ddaac28f86e034c54168051d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20K=C3=A1d=C3=A1r?= Date: Mon, 18 Jul 2016 16:01:22 +0200 Subject: [PATCH] Memory leak is fixed in ecma_builtin_regexp_prototype_exec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue fixed: #1079 JerryScript-DCO-1.0-Signed-off-by: István Kádár ikadar@inf.u-szeged.hu --- .../ecma-builtin-regexp-prototype.c | 27 ++++++------------- tests/jerry/regression-test-issue-1079.js | 18 +++++++++++++ 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 tests/jerry/regression-test-issue-1079.js diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c index b87775b16..6183bcbb8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c @@ -275,30 +275,19 @@ ecma_builtin_regexp_prototype_exec (ecma_value_t this_arg, /**< this argument */ if (bytecode_p == NULL) { /* Missing bytecode means empty RegExp: '/(?:)/', so always return empty string. */ - ecma_value_t result_array = ecma_op_create_array_object (0, 0, false); - ecma_object_t *result_array_obj_p = ecma_get_object_from_value (result_array); - ecma_string_t *input_str_p = ecma_get_string_from_value (input_str_value); - re_set_result_array_properties (result_array_obj_p, - input_str_p, - 1, - 0); - - ecma_string_t *index_str_p = ecma_new_ecma_string_from_uint32 (0); ecma_string_t *capture_str_p = ecma_get_magic_string (LIT_MAGIC_STRING__EMPTY); - ECMA_TRY_CATCH (put_res_value, - ecma_op_object_put (result_array_obj_p, - index_str_p, - ecma_make_string_value (capture_str_p), - true), - ret_value); + ecma_value_t arguments_list[1]; + arguments_list[0] = ecma_make_string_value (capture_str_p); - ret_value = result_array; - - ECMA_FINALIZE (put_res_value) + ret_value = ecma_op_create_array_object (arguments_list, 1, false); ecma_deref_ecma_string (capture_str_p); - ecma_deref_ecma_string (index_str_p); + + re_set_result_array_properties (ecma_get_object_from_value (ret_value), + ecma_get_string_from_value (input_str_value), + 1, + 0); } else { diff --git a/tests/jerry/regression-test-issue-1079.js b/tests/jerry/regression-test-issue-1079.js new file mode 100644 index 000000000..73c5534b6 --- /dev/null +++ b/tests/jerry/regression-test-issue-1079.js @@ -0,0 +1,18 @@ +// Copyright 2016 Samsung Electronics Co., Ltd. +// Copyright 2016 University of Szeged. +// +// 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. + +Array.prototype.push(1) +Object.freeze(Array.prototype) +try { new RegExp().constructor.prototype.exec() } catch($){}