YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix key iteration in ecma_op_map_foreach (#2855)

Browse Source 
This patch fixes #2852 and fixes #2853 as well.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2019-05-08 15:21:43 +02:00
committed by Dániel Bátyai
parent eb993d57ed
commit 2d1ad149c1
3 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-map-object.c
+15 -2
View File
@@ -377,7 +377,12 @@ ecma_op_map_foreach (ecma_value_t this_arg, /**< this argument */
{
ecma_string_t *prop_name_p = ecma_get_prop_name_from_value (*ecma_value_p);
ecma_property_t *property_p = ecma_find_named_property (internal_obj_p, prop_name_p);
JERRY_ASSERT (property_p != NULL);
if (property_p == NULL)
{
ecma_value_p = ecma_collection_iterator_next (ecma_value_p);
continue;
}
ecma_value_t value = ecma_copy_value (ECMA_PROPERTY_VALUE_PTR (property_p)->value);
ecma_value_t key_arg;
@@ -388,7 +393,15 @@ ecma_op_map_foreach (ecma_value_t this_arg, /**< this argument */
}
else
{
key_arg = *ecma_value_p;
if (ECMA_IS_DIRECT_STRING (prop_name_p)
&& ECMA_GET_DIRECT_STRING_TYPE (prop_name_p) == ECMA_DIRECT_STRING_ECMA_INTEGER)
{
key_arg = ecma_make_uint32_value ((uint32_t) ECMA_GET_DIRECT_STRING_VALUE (prop_name_p));
}
else
{
key_arg = *ecma_value_p;
}
}
ecma_value_t call_args[] = { value, key_arg };