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

Ensure that symbol properties can be set via computed object literals (#2747)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2019-02-13 18:32:36 +01:00
committed by GitHub
parent 044b4ea827
commit cffb299f37
2 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/vm/vm.c
+10 -38
View File
@@ -1199,29 +1199,18 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
JERRY_ASSERT ((opcode_data >> VM_OC_NON_STATIC_SHIFT) <= 0x1);
result = right_value;
ecma_string_t *prop_name_p = ecma_op_to_prop_name (right_value);
if (JERRY_UNLIKELY (!ecma_is_value_string (right_value)))
if (JERRY_UNLIKELY (prop_name_p == NULL))
{
result = ecma_op_to_string (right_value);
if (ECMA_IS_VALUE_ERROR (result))
{
goto error;
}
result = ECMA_VALUE_ERROR;
goto error;
}
ecma_string_t *prop_name_p = ecma_get_string_from_value (result);
#ifndef CONFIG_DISABLE_ES2015_CLASS
if (JERRY_UNLIKELY (ecma_compare_ecma_string_to_magic_id (prop_name_p, LIT_MAGIC_STRING_PROTOTYPE))
&& !(opcode_data & VM_OC_NON_STATIC_FLAG))
{
if (!ecma_is_value_string (right_value))
{
ecma_deref_ecma_string (prop_name_p);
}
result = ecma_raise_type_error (ECMA_ERR_MSG ("prototype property of a class is non-configurable"));
goto error;
}
@@ -1257,10 +1246,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
ecma_named_data_property_assign_value (object_p, prop_value_p, left_value);
if (!ecma_is_value_string (right_value))
{
ecma_deref_ecma_string (prop_name_p);
}
ecma_deref_ecma_string (prop_name_p);
goto free_both_values;
}
@@ -1269,29 +1255,18 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
{
JERRY_ASSERT ((opcode_data >> VM_OC_NON_STATIC_SHIFT) <= 0x1);
result = left_value;
ecma_string_t *prop_name_p = ecma_op_to_prop_name (left_value);
if (JERRY_UNLIKELY (!ecma_is_value_string (left_value)))
if (JERRY_UNLIKELY (prop_name_p == NULL))
{
result = ecma_op_to_string (left_value);
if (ECMA_IS_VALUE_ERROR (result))
{
goto error;
}
result = ECMA_VALUE_ERROR;
goto error;
}
ecma_string_t *prop_name_p = ecma_get_string_from_value (result);
#ifndef CONFIG_DISABLE_ES2015_CLASS
if (JERRY_UNLIKELY (ecma_compare_ecma_string_to_magic_id (prop_name_p, LIT_MAGIC_STRING_PROTOTYPE))
&& !(opcode_data & VM_OC_NON_STATIC_FLAG))
{
if (!ecma_is_value_string (left_value))
{
ecma_deref_ecma_string (prop_name_p);
}
result = ecma_raise_type_error (ECMA_ERR_MSG ("prototype property of a class is non-configurable"));
goto error;
}
@@ -1306,10 +1281,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
prop_name_p,
right_value);
if (!ecma_is_value_string (left_value))
{
ecma_deref_ecma_string (prop_name_p);
}
ecma_deref_ecma_string (prop_name_p);
goto free_both_values;
}