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

Fix null getters/setters in jerry_property_descriptor_from_ecma (#4573)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg
2021-02-09 15:01:50 +01:00
committed by GitHub
parent 6fd0dfec35
commit 53aed02762
2 changed files with 147 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/api/jerry.c
+20 -14
View File
@@ -3244,47 +3244,53 @@ jerry_property_descriptor_from_ecma (const ecma_property_descriptor_t *prop_desc
jerry_property_descriptor_t prop_desc;
jerry_init_property_descriptor_fields (&prop_desc);
if (prop_desc_p->flags & (ECMA_PROP_IS_ENUMERABLE_DEFINED))
if (prop_desc_p->flags & ECMA_PROP_IS_ENUMERABLE_DEFINED)
{
prop_desc.is_enumerable_defined = true;
prop_desc.is_enumerable = prop_desc_p->flags & (ECMA_PROP_IS_ENUMERABLE);
prop_desc.is_enumerable = prop_desc_p->flags & ECMA_PROP_IS_ENUMERABLE;
}
if (prop_desc_p->flags & (ECMA_PROP_IS_CONFIGURABLE_DEFINED))
if (prop_desc_p->flags & ECMA_PROP_IS_CONFIGURABLE_DEFINED)
{
prop_desc.is_configurable_defined = true;
prop_desc.is_configurable = prop_desc_p->flags & (ECMA_PROP_IS_CONFIGURABLE);
prop_desc.is_configurable = prop_desc_p->flags & ECMA_PROP_IS_CONFIGURABLE;
}
prop_desc.is_value_defined = prop_desc_p->flags & (ECMA_PROP_IS_VALUE_DEFINED);
prop_desc.is_value_defined = prop_desc_p->flags & ECMA_PROP_IS_VALUE_DEFINED;
if (prop_desc.is_value_defined)
{
prop_desc.value = prop_desc_p->value;
}
if (prop_desc_p->flags & (ECMA_PROP_IS_WRITABLE_DEFINED))
if (prop_desc_p->flags & ECMA_PROP_IS_WRITABLE_DEFINED)
{
prop_desc.is_writable_defined = true;
prop_desc.is_writable = prop_desc_p->flags & (ECMA_PROP_IS_WRITABLE);
prop_desc.is_writable = prop_desc_p->flags & ECMA_PROP_IS_WRITABLE;
}
if (prop_desc_p->flags & (ECMA_PROP_IS_GET_DEFINED))
if (prop_desc_p->flags & ECMA_PROP_IS_GET_DEFINED)
{
ecma_value_t getter = ecma_make_object_value (prop_desc_p->get_p);
prop_desc.getter = ECMA_VALUE_NULL;
prop_desc.is_get_defined = true;
if (ecma_op_is_callable (getter))
if (prop_desc_p->get_p != NULL)
{
prop_desc.getter = getter;
prop_desc.getter = ecma_make_object_value (prop_desc_p->get_p);
JERRY_ASSERT (ecma_op_is_callable (prop_desc.getter));
}
}
if (prop_desc_p->flags & (ECMA_PROP_IS_SET_DEFINED))
if (prop_desc_p->flags & ECMA_PROP_IS_SET_DEFINED)
{
ecma_value_t setter = ecma_make_object_value (prop_desc_p->set_p);
prop_desc.setter = ECMA_VALUE_NULL;
prop_desc.is_set_defined = true;
prop_desc.setter = setter;
if (prop_desc_p->set_p != NULL)
{
prop_desc.setter = ecma_make_object_value (prop_desc_p->set_p);
JERRY_ASSERT (ecma_op_is_callable (prop_desc.setter));
}
}
return prop_desc;
tests/unit-core/test-to-property-descriptor.c
+127 -40
View File
@@ -17,6 +17,48 @@
#include "jerryscript.h"
#include "test-common.h"
static jerry_value_t
create_property_descriptor (const char *script_p) /**< source code */
{
jerry_value_t result = jerry_eval ((const jerry_char_t *) script_p, strlen (script_p), 0);
TEST_ASSERT (jerry_value_is_object (result));
return result;
} /* create_property_descriptor */
static void
check_attribute (jerry_value_t attribute, /**< attribute to be checked */
jerry_value_t object, /**< original object */
const char *name_p) /**< name of the attribute */
{
jerry_value_t prop_name = jerry_create_string_from_utf8 ((const jerry_char_t *) name_p);
jerry_value_t value = jerry_get_property (object, prop_name);
if (jerry_value_is_undefined (value))
{
TEST_ASSERT (jerry_value_is_null (attribute));
}
else
{
jerry_value_t result = jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, attribute, value);
TEST_ASSERT (jerry_value_is_boolean (result) && jerry_get_boolean_value (result));
jerry_release_value (result);
}
jerry_release_value (value);
jerry_release_value (prop_name);
} /* check_attribute */
static void
to_property_descriptor (jerry_value_t object, /**< object */
jerry_property_descriptor_t *prop_desc_p) /**< property descriptor */
{
jerry_init_property_descriptor_fields (prop_desc_p);
jerry_value_t result = jerry_to_property_descriptor (object, prop_desc_p);
TEST_ASSERT (jerry_value_is_boolean (result) && jerry_get_boolean_value (result));
jerry_release_value (result);
} /* to_property_descriptor */
int
main (void)
{
@@ -24,55 +66,100 @@ main (void)
jerry_init (JERRY_INIT_EMPTY);
jerry_value_t object = jerry_create_object ();
jerry_value_t prop_name;
jerry_value_t value = jerry_create_boolean (true);
jerry_property_descriptor_t prop_desc;
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "value");
TEST_ASSERT (jerry_set_property (object, prop_name, value));
/* Next test. */
const char *source_p = "({ value:'X', writable:true, enumerable:true, configurable:true })";
jerry_value_t object = create_property_descriptor (source_p);
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "writable");
TEST_ASSERT (jerry_set_property (object, prop_name, value));
to_property_descriptor (object, &prop_desc);
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "writable");
TEST_ASSERT (jerry_set_property (object, prop_name, value));
check_attribute (prop_desc.value, object, "value");
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "enumerable");
TEST_ASSERT (jerry_set_property (object, prop_name, value));
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "configurable");
TEST_ASSERT (jerry_set_property (object, prop_name, value));
jerry_value_t result = jerry_to_property_descriptor (object, &prop_desc);
TEST_ASSERT (jerry_value_is_boolean (result) && jerry_get_boolean_value (result));
jerry_release_value (result);
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "value");
value = jerry_get_property (object, prop_name);
TEST_ASSERT (value == prop_desc.value);
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "writable");
value = jerry_get_property (object, prop_name);
TEST_ASSERT (jerry_get_boolean_value (value) == prop_desc.is_writable);
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "writable");
value = jerry_get_property (object, prop_name);
TEST_ASSERT (jerry_get_boolean_value (value) == prop_desc.is_writable);
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "enumerable");
value = jerry_get_property (object, prop_name);
TEST_ASSERT (jerry_get_boolean_value (value) == prop_desc.is_enumerable);
prop_name = jerry_create_string_from_utf8 ((jerry_char_t *) "configurable");
value = jerry_get_property (object, prop_name);
TEST_ASSERT (jerry_get_boolean_value (value) == prop_desc.is_configurable);
TEST_ASSERT (prop_desc.is_value_defined);
TEST_ASSERT (!prop_desc.is_get_defined && !prop_desc.is_set_defined);
TEST_ASSERT (prop_desc.is_writable_defined && prop_desc.is_writable);
TEST_ASSERT (prop_desc.is_enumerable_defined && prop_desc.is_enumerable);
TEST_ASSERT (prop_desc.is_configurable_defined && prop_desc.is_configurable);
jerry_release_value (object);
jerry_release_value (prop_name);
jerry_release_value (value);
jerry_free_property_descriptor_fields (&prop_desc);
/* Next test. */
source_p = "({ writable:false, configurable:true })";
object = create_property_descriptor (source_p);
to_property_descriptor (object, &prop_desc);
TEST_ASSERT (!prop_desc.is_value_defined);
TEST_ASSERT (!prop_desc.is_get_defined && !prop_desc.is_set_defined);
TEST_ASSERT (prop_desc.is_writable_defined && !prop_desc.is_writable);
TEST_ASSERT (!prop_desc.is_enumerable_defined);
TEST_ASSERT (prop_desc.is_configurable_defined && prop_desc.is_configurable);
jerry_release_value (object);
jerry_free_property_descriptor_fields (&prop_desc);
/* Next test. */
/* Note: the 'set' property is defined, and it has a value of undefined.
* This is different from not having a 'set' property. */
source_p = "({ get: function() {}, set:undefined, configurable:true })";
object = create_property_descriptor (source_p);
to_property_descriptor (object, &prop_desc);
check_attribute (prop_desc.getter, object, "get");
check_attribute (prop_desc.setter, object, "set");
TEST_ASSERT (!prop_desc.is_value_defined && !prop_desc.is_writable_defined);
TEST_ASSERT (prop_desc.is_get_defined && prop_desc.is_set_defined);
TEST_ASSERT (!prop_desc.is_enumerable_defined);
TEST_ASSERT (prop_desc.is_configurable_defined && prop_desc.is_configurable);
jerry_release_value (object);
jerry_free_property_descriptor_fields (&prop_desc);
/* Next test. */
source_p = "({ get: undefined, enumerable:false })";
object = create_property_descriptor (source_p);
to_property_descriptor (object, &prop_desc);
check_attribute (prop_desc.getter, object, "get");
TEST_ASSERT (!prop_desc.is_value_defined && !prop_desc.is_writable_defined);
TEST_ASSERT (prop_desc.is_get_defined && !prop_desc.is_set_defined);
TEST_ASSERT (prop_desc.is_enumerable_defined && !prop_desc.is_enumerable);
TEST_ASSERT (!prop_desc.is_configurable_defined);
jerry_release_value (object);
jerry_free_property_descriptor_fields (&prop_desc);
/* Next test. */
source_p = "({ set: function(v) {}, enumerable:true, configurable:false })";
object = create_property_descriptor (source_p);
to_property_descriptor (object, &prop_desc);
check_attribute (prop_desc.setter, object, "set");
TEST_ASSERT (!prop_desc.is_value_defined && !prop_desc.is_writable_defined);
TEST_ASSERT (!prop_desc.is_get_defined && prop_desc.is_set_defined);
TEST_ASSERT (prop_desc.is_enumerable_defined && prop_desc.is_enumerable);
TEST_ASSERT (prop_desc.is_configurable_defined && !prop_desc.is_configurable);
jerry_release_value (object);
jerry_free_property_descriptor_fields (&prop_desc);
/* Next test. */
source_p = "({ get: function(v) {}, writable:true })";
object = create_property_descriptor (source_p);
jerry_value_t result = jerry_to_property_descriptor (object, &prop_desc);
TEST_ASSERT (jerry_value_is_error (result));
jerry_release_value (result);
jerry_release_value (object);
/* Next test. */
object = jerry_create_null ();
result = jerry_to_property_descriptor (object, &prop_desc);
TEST_ASSERT (jerry_value_is_error (result));