Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions jerry-core/ecma/builtin-objects/ecma-builtins.c
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,15 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in
index = 0;
}

#ifndef CONFIG_DISABLE_ES2015_SYMBOL_BUILTIN
/* Builtin symbol properties are internal magic strings which must not be listed */
if (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT)
{
curr_property_p++;
continue;
}
#endif /* !CONFIG_DISABLE_ES2015_SYMBOL_BUILTIN */

ecma_string_t *name_p = ecma_get_magic_string ((lit_magic_string_id_t) curr_property_p->magic_string_id);

uint32_t bit_for_index = (uint32_t) 1u << index;
Expand Down
49 changes: 49 additions & 0 deletions tests/jerry/es2015/regression-test-issue-2733.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// 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 recursion_counter = 0;
var recursion_limit = 1000;
var fz_globalObject = this

function fz_is_primitive(value) {
var value_type = typeof value
if (value_type !== "function" && value_type !== "object")
return value_type
}

function fz_starts_with(str, pattern) {
for (var i = 0; i < pattern.length; i++)
if (str[i] !== pattern[i])
return
return true
}

function fz_collect_values(value) {
if (++recursion_counter >= recursion_limit) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: The reason I've slightly modified the original test case is due to the endless recursion call. Via this check the test case can be added, also the fixed area is triggered the same way as in the reported issue.

return
}

var primitive = fz_is_primitive(value)
if (primitive)
return
var prop_names = Object.getOwnPropertyNames(value)
for (var i = 0; i < prop_names.length; i++) {
var prop_name = prop_names[i]
if (!fz_starts_with(prop_name, "fz_")) {
fz_collect_values(value[prop_name])
}
}
}

fz_collect_values(fz_globalObject)