archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix mutable binding creation for realms with proxy this binding (#4370)

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-01-07 11:09:33 +01:00 committed by GitHub
parent 7baaafa405
commit 128f18a225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jerry-core/ecma/operations/ecma-lex-env.c
View File

@ -21,6 +21,7 @@
#include "ecma-helpers.h"
#include "ecma-lex-env.h"
#include "ecma-objects.h"
#include "ecma-proxy-object.h"
#include "jcontext.h"
/** \addtogroup ecma ECMA
@ -175,10 +176,31 @@ ecma_op_create_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environme
ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p);
#if ENABLED (JERRY_BUILTIN_PROXY) && ENABLED (JERRY_BUILTIN_REALMS)
if (ECMA_OBJECT_IS_PROXY (binding_obj_p))
{
ecma_value_t result = ecma_proxy_object_is_extensible (binding_obj_p);
if (ECMA_IS_VALUE_ERROR (result))
{
return result;
}
if (result == ECMA_VALUE_FALSE)
{
return ECMA_VALUE_EMPTY;
}
}
else if (!ecma_op_ordinary_object_is_extensible (binding_obj_p))
{
return ECMA_VALUE_EMPTY;
}
#else /* !ENABLED (JERRY_BUILTIN_PROXY) || !ENABLED (JERRY_BUILTIN_REALMS) */
if (!ecma_op_ordinary_object_is_extensible (binding_obj_p))
{
return ECMA_VALUE_EMPTY;
}
#endif /* ENABLED (JERRY_BUILTIN_PROXY) && ENABLED (JERRY_BUILTIN_REALMS) */
const uint32_t flags = ECMA_PROPERTY_ENUMERABLE_WRITABLE | ECMA_IS_THROW;

7
jerry-core/vm/opcodes.c
View File

@ -68,6 +68,13 @@ vm_var_decl (ecma_object_t *lex_env_p, /**< target lexical environment */
var_name_str_p,
is_configurable_bindings);
#if ENABLED (JERRY_BUILTIN_PROXY)
if (ECMA_IS_VALUE_ERROR (completion_value))
{
return completion_value;
}
#endif /* ENABLED (JERRY_BUILTIN_PROXY) */
JERRY_ASSERT (ecma_is_value_empty (completion_value));
/* Skipping SetMutableBinding as we have already checked that there were not

42
tests/unit-core/test-realm.c
View File

@ -167,6 +167,48 @@ main (void)
jerry_release_value (object_value);
jerry_release_value (realm_value);
if (jerry_is_feature_enabled (JERRY_FEATURE_PROXY))
{
/* Check property creation. */
jerry_value_t handler_value = jerry_create_object ();
jerry_value_t target_value = jerry_create_realm ();
jerry_value_t proxy_value = jerry_create_proxy (target_value, handler_value);
jerry_realm_set_this (target_value, proxy_value);
jerry_release_value (proxy_value);
jerry_release_value (handler_value);
jerry_value_t old_realm_value = jerry_set_realm (target_value);
TEST_ASSERT (!jerry_value_is_error (old_realm_value));
TEST_ASSERT (eval_and_get_number ("var z = 1.5; z") == 1.5);
jerry_set_realm (old_realm_value);
TEST_ASSERT (get_number_property (target_value, "z") == 1.5);
jerry_release_value (target_value);
/* Check isExtensible error. */
const char *script_p = "new Proxy({}, { isExtensible: function() { throw 42.5 } })";
proxy_value = jerry_eval ((const jerry_char_t *) script_p, strlen (script_p), JERRY_PARSE_NO_OPTS);
TEST_ASSERT (!jerry_value_is_error (proxy_value) && jerry_value_is_object (proxy_value));
target_value = jerry_create_realm ();
jerry_realm_set_this (target_value, proxy_value);
jerry_release_value (proxy_value);
old_realm_value = jerry_set_realm (target_value);
TEST_ASSERT (!jerry_value_is_error (old_realm_value));
script_p = "var z = 1.5";
result_value = jerry_eval ((const jerry_char_t *) script_p, strlen (script_p), JERRY_PARSE_NO_OPTS);
jerry_set_realm (old_realm_value);
jerry_release_value (target_value);
TEST_ASSERT (jerry_value_is_error (result_value));
result_value = jerry_get_value_from_error (result_value, true);
TEST_ASSERT (jerry_value_is_number (result_value) && jerry_get_number_value (result_value) == 42.5);
jerry_release_value (result_value);
}
jerry_cleanup ();
return 0;
} /* main */