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

Fix cleanup on error in Array.from (#3423)

Browse Source 
This patch fixes #3420.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2019-12-05 20:24:37 +01:00
committed by Zoltan Herczeg
parent 1a4972fc3f
commit 99fa823bab
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-array.c
+9 -8
View File
@@ -321,14 +321,12 @@ iterator_cleanup:
while (k < len)
{
/* 16.b */
ecma_string_t *pk = ecma_new_ecma_string_from_uint32 (k);
ecma_value_t k_value = ecma_op_object_get (array_like_obj_p, pk);
ecma_deref_ecma_string (pk);
ecma_value_t k_value = ecma_op_object_get_by_uint32_index (array_like_obj_p, k);
/* 16.c */
if (ECMA_IS_VALUE_ERROR (k_value))
{
goto cleanup;
goto construct_cleanup;
}
ecma_value_t mapped_value;
@@ -344,7 +342,7 @@ iterator_cleanup:
/* 16.d.ii */
if (ECMA_IS_VALUE_ERROR (mapped_value))
{
goto cleanup;
goto construct_cleanup;
}
}
else
@@ -362,7 +360,7 @@ iterator_cleanup:
/* 16.g */
if (ECMA_IS_VALUE_ERROR (set_status))
{
goto cleanup;
goto construct_cleanup;
}
/* 16.h */
@@ -380,12 +378,15 @@ iterator_cleanup:
/* 18. */
if (ECMA_IS_VALUE_ERROR (set_status))
{
goto cleanup;
goto construct_cleanup;
}
/* 19. */
ret_value = ecma_make_object_value (array_obj_p);
ecma_deref_object (array_like_obj_p);
return ecma_make_object_value (array_obj_p);
construct_cleanup:
ecma_deref_object (array_obj_p);
cleanup:
ecma_deref_object (array_like_obj_p);
return ret_value;