Skip to content

Commit 6b09e53

Browse files
committed
Fix implementation of the Object.defineProperties according to the review.
JerryScript-DCO-1.0-Signed-off-by: Kristof Kosztyo [email protected]
1 parent 8058a42 commit 6b09e53

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,11 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg __attr_unuse
303303
}
304304

305305
ecma_object_t *obj_p = ecma_get_object_from_value (arg1);
306-
ecma_object_t *props = ecma_get_object_from_value (arg2);
306+
ecma_object_t *props_p = ecma_get_object_from_value (arg2);
307307

308308
ecma_property_t *property_p;
309309

310-
for (property_p = ecma_get_property_list (props);
310+
for (property_p = ecma_get_property_list (props_p);
311311
property_p != NULL;
312312
property_p = ECMA_GET_POINTER (ecma_property_t, property_p->next_property_p))
313313
{
@@ -327,11 +327,15 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg __attr_unuse
327327
{
328328
continue;
329329
}
330-
ecma_value_t val = ecma_get_named_data_property_value (property_p);
331330
ecma_property_descriptor_t prop_desc;
332331

332+
ECMA_TRY_CATCH (descObj,
333+
ecma_op_general_object_get (props_p, property_name_p),
334+
ret_value);
335+
333336
ECMA_TRY_CATCH (conv_result,
334-
ecma_op_to_property_descriptor (val, &prop_desc),
337+
ecma_op_to_property_descriptor (ecma_get_completion_value_value (descObj),
338+
&prop_desc),
335339
ret_value);
336340

337341
ECMA_TRY_CATCH (define_own_prop_ret,
@@ -344,6 +348,7 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg __attr_unuse
344348
ECMA_FINALIZE (define_own_prop_ret);
345349
ecma_free_property_descriptor (&prop_desc);
346350
ECMA_FINALIZE (conv_result);
351+
ECMA_FINALIZE (descObj);
347352

348353
if (ecma_is_completion_value_throw (ret_value))
349354
{

0 commit comments

Comments
 (0)