Skip to content

Commit 14daa90

Browse files
committed
Fix rare crash caused by get method of proxy object
This fixes #5101 In rare cases the proxy object could get used after being incorrectly removed by the gc Add stack checks to the start of all function calls JerryScript-DCO-1.0-Signed-off-by: Máté Tokodi mate.tokodi@szteszoftver.hu
1 parent bac7ee3 commit 14daa90

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

jerry-core/ecma/operations/ecma-function-object.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,8 @@ ecma_op_function_call_constructor (vm_frame_ctx_shared_args_t *shared_args_p, /*
10101010
ecma_object_t *scope_p, /**< lexical environment to use */
10111011
ecma_value_t this_binding) /**< value of 'ThisBinding' */
10121012
{
1013+
ECMA_CHECK_STACK_USAGE ();
1014+
10131015
shared_args_p->header.status_flags |= VM_FRAME_CTX_SHARED_NON_ARROW_FUNC;
10141016

10151017
ecma_value_t ret_value;
@@ -1080,6 +1082,8 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */
10801082
{
10811083
JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION);
10821084

1085+
ECMA_CHECK_STACK_USAGE ();
1086+
10831087
vm_frame_ctx_shared_args_t shared_args;
10841088
shared_args.header.status_flags = VM_FRAME_CTX_SHARED_HAS_ARG_LIST;
10851089
shared_args.header.function_object_p = func_obj_p;
@@ -1205,6 +1209,8 @@ ecma_op_function_call_native_built_in (ecma_object_t *func_obj_p, /**< Function
12051209
{
12061210
JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION);
12071211

1212+
ECMA_CHECK_STACK_USAGE ();
1213+
12081214
#if JERRY_BUILTIN_REALMS
12091215
ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p);
12101216

@@ -1235,6 +1241,8 @@ ecma_op_function_call_native (ecma_object_t *func_obj_p, /**< Function object */
12351241
{
12361242
JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_NATIVE_FUNCTION);
12371243

1244+
ECMA_CHECK_STACK_USAGE ();
1245+
12381246
ecma_native_function_t *native_function_p = (ecma_native_function_t *) func_obj_p;
12391247

12401248
#if JERRY_BUILTIN_REALMS

jerry-core/ecma/operations/ecma-proxy-object.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,9 @@ ecma_proxy_object_get (ecma_object_t *obj_p, /**< proxy object */
11701170
ecma_value_t args[] = { proxy_obj_p->target, prop_value, receiver };
11711171

11721172
/* 9. */
1173+
ecma_ref_object (obj_p);
11731174
ecma_value_t trap_result = ecma_op_function_call (func_obj_p, handler, args, 3);
1175+
ecma_deref_object (obj_p);
11741176

11751177
ecma_deref_object (func_obj_p);
11761178

0 commit comments

Comments
 (0)