Skip to content

Fix ecma_get_property_descriptor_from_property function #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix ecma_get_property_descriptor_from_property function #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 29 additions & 4 deletions jerry-core/ecma/base/ecma-helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,29 +1240,54 @@ ecma_free_property_descriptor (ecma_property_descriptor_t *prop_desc_p) /**< pro
} /* ecma_free_property_descriptor */

/**
* Return property descriptor of property.
* Construct property descriptor from specified property
*
* @return property descriptor, corresponding to type and content of the specified property, i.e.:
* - for named data properties: { [Value], [Writable], [Enumerable], [Configurable] };
* - for named accessor properties: { [Get] - if defined,
* [Set] - if defined,
* [Enumerable], [Configurable]
* }.
*/
ecma_property_descriptor_t
ecma_get_property_descriptor_from_property (ecma_property_t *prop_p) /**< property */
{
ecma_property_descriptor_t prop_desc = ecma_make_empty_property_descriptor ();

prop_desc.is_enumerable = ecma_is_property_enumerable (prop_p);
prop_desc.is_enumerable_defined = true;
prop_desc.is_configurable = ecma_is_property_configurable (prop_p);
prop_desc.is_configurable_defined = true;

if (prop_p->type == ECMA_PROPERTY_NAMEDDATA)
{
prop_desc.value = ecma_get_named_data_property_value (prop_p);
prop_desc.value = ecma_copy_value (ecma_get_named_data_property_value (prop_p), true);
prop_desc.is_value_defined = true;
prop_desc.is_writable = ecma_is_property_writable (prop_p);
prop_desc.is_writable_defined = true;
}
else if (prop_p->type == ECMA_PROPERTY_NAMEDACCESSOR)
{
prop_desc.get_p = ecma_get_named_accessor_property_getter (prop_p);
prop_desc.is_get_defined = prop_desc.get_p != NULL ? true : false;
if (prop_desc.get_p != NULL)
{
prop_desc.is_get_defined = true;
ecma_ref_object (prop_desc.get_p);
}
else
{
prop_desc.is_get_defined = false;
}
prop_desc.set_p = ecma_get_named_accessor_property_setter (prop_p);
prop_desc.is_set_defined = prop_desc.set_p != NULL ? true : false;
if (prop_desc.set_p != NULL)
{
prop_desc.is_set_defined = true;
ecma_ref_object (prop_desc.set_p);
}
else
{
prop_desc.is_set_defined = false;
}
}

return prop_desc;
Expand Down
2 changes: 2 additions & 0 deletions jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,8 @@ ecma_builtin_object_object_get_own_property_descriptor (ecma_value_t this_arg __
// 4.
ecma_object_t* desc_obj_p = ecma_op_from_property_descriptor (&prop_desc);

ecma_free_property_descriptor (&prop_desc);

ret_value = ecma_make_normal_completion_value (ecma_make_object_value (desc_obj_p));
}
else
Expand Down