Skip to content

Primitive this values of accessors should not be coerced in strict mode #3854

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

Merged
merged 1 commit into from
Jun 5, 2020
Merged

Primitive this values of accessors should not be coerced in strict mode #3854

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
129 changes: 73 additions & 56 deletions jerry-core/vm/vm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,84 +154,101 @@ vm_op_get_value (ecma_value_t object, /**< base object */
* if the property setting is unsuccessful
*/
static ecma_value_t
vm_op_set_value (ecma_value_t object, /**< base object */
vm_op_set_value (ecma_value_t base, /**< base object */
ecma_value_t property, /**< property name */
ecma_value_t value, /**< ecma value */
bool is_strict) /**< strict mode */
{
ecma_object_t * object_p;
ecma_value_t result = ECMA_VALUE_EMPTY;
ecma_object_t *object_p;
ecma_string_t *property_p;

if (JERRY_UNLIKELY (!ecma_is_value_object (object)))
if (JERRY_UNLIKELY (!ecma_is_value_object (base)))
{
ecma_value_t to_object = ecma_op_to_object (object);
ecma_free_value (object);

if (ECMA_IS_VALUE_ERROR (to_object))
if (JERRY_UNLIKELY (ecma_is_value_null (base) || ecma_is_value_undefined (base)))
{
#if ENABLED (JERRY_ERROR_MESSAGES)
ecma_free_value (to_object);
jcontext_release_exception ();

ecma_value_t error_value = ecma_raise_standard_error_with_format (ECMA_ERROR_TYPE,
"Cannot set property '%' of %",
property,
object);
ecma_free_value (property);

return error_value;
result = ecma_raise_standard_error_with_format (ECMA_ERROR_TYPE,
"Cannot set property '%' of %",
property,
base);
#else /* !ENABLED (JERRY_ERROR_MESSAGES) */
ecma_free_value (property);
return to_object;
result = ecma_raise_type_error (NULL);
#endif /* ENABLED (JERRY_ERROR_MESSAGES) */
ecma_free_value (property);
return result;
}

object_p = ecma_get_object_from_value (to_object);
if (JERRY_UNLIKELY (!ecma_is_value_prop_name (property)))
{
property_p = ecma_op_to_string (property);
ecma_fast_free_value (property);

if (JERRY_UNLIKELY (property_p == NULL))
{
ecma_free_value (base);
return ECMA_VALUE_ERROR;
}
}
else
{
property_p = ecma_get_prop_name_from_value (property);
}

ecma_value_t object = ecma_op_to_object (base);
JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (object));

object_p = ecma_get_object_from_value (object);
ecma_op_ordinary_object_prevent_extensions (object_p);
Copy link
Member

@zherczeg zherczeg Jun 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this standard?

Copy link
Member Author

@dbatyai dbatyai Jun 4, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been added as part of #2917, it seems to me that it's correct.


result = ecma_op_object_put_with_receiver (object_p,
property_p,
value,
base,
is_strict);

ecma_free_value (base);
}
else
{
object_p = ecma_get_object_from_value (object);
}
object_p = ecma_get_object_from_value (base);

ecma_string_t *property_p;

if (!ecma_is_value_prop_name (property))
{
property_p = ecma_op_to_prop_name (property);
ecma_fast_free_value (property);
if (JERRY_UNLIKELY (!ecma_is_value_prop_name (property)))
{
property_p = ecma_op_to_string (property);
ecma_fast_free_value (property);

if (JERRY_UNLIKELY (property_p == NULL))
if (JERRY_UNLIKELY (property_p == NULL))
{
ecma_deref_object (object_p);
return ECMA_VALUE_ERROR;
}
}
else
{
ecma_deref_object (object_p);
return ECMA_VALUE_ERROR;
property_p = ecma_get_prop_name_from_value (property);
}
}
else
{
property_p = ecma_get_prop_name_from_value (property);
}

ecma_value_t completion_value = ECMA_VALUE_EMPTY;

if (!ecma_is_lexical_environment (object_p))
{
completion_value = ecma_op_object_put (object_p,
property_p,
value,
is_strict);
}
else
{
completion_value = ecma_op_set_mutable_binding (object_p,
property_p,
value,
is_strict);
if (!ecma_is_lexical_environment (object_p))
{
result = ecma_op_object_put_with_receiver (object_p,
property_p,
value,
base,
is_strict);
}
else
{
result = ecma_op_set_mutable_binding (object_p,
property_p,
value,
is_strict);
}
}

ecma_deref_object (object_p);
ecma_deref_ecma_string (property_p);

return completion_value;
return result;
} /* vm_op_set_value */

/** Compact bytecode define */
Expand Down Expand Up @@ -3873,9 +3890,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
else if (opcode_data & VM_OC_PUT_REFERENCE)
{
ecma_value_t property = *(--stack_top_p);
ecma_value_t object = *(--stack_top_p);
ecma_value_t base = *(--stack_top_p);

if (object == ECMA_VALUE_REGISTER_REF)
if (base == ECMA_VALUE_REGISTER_REF)
{
property = (ecma_value_t) ecma_get_integer_from_value (property);
ecma_fast_free_value (VM_GET_REGISTER (frame_ctx_p, property));
Expand All @@ -3889,7 +3906,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
}
else
{
ecma_value_t set_value_result = vm_op_set_value (object,
ecma_value_t set_value_result = vm_op_set_value (base,
property,
result,
is_strict);
Expand Down
16 changes: 16 additions & 0 deletions tests/jerry/getter-setter-this-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,19 @@ Object.defineProperty(Box.prototype, 'data', {
assert(box.data === '=');
box.data = '+';
assert(box.data === '+');

function test_access(value, proto) {
"use strict"

Object.defineProperty(proto, 'test', {
get: function () { assert (this === value) },
set: function () { assert (this === value) }
});

value.test;
value.test = undefined;
}

test_access ("str", String.prototype);
test_access (1, Number.prototype);
test_access (true, Boolean.prototype);