Skip to content

Do not trust argument_end to select the shared frame layout (#5302) #5310

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

Open
1820893135-pixel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not trust argument_end to select the shared frame layout (#5302) #5310

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
8 changes: 5 additions & 3 deletions jerry-core/vm/vm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5183,10 +5183,12 @@ vm_init_exec (vm_frame_ctx_t *frame_ctx_p) /**< frame context */

uint32_t arg_list_len = 0;

if (argument_end > 0)
/* shared_p only has the vm_frame_ctx_shared_args_t layout - the one carrying the
* argument list - when VM_FRAME_CTX_SHARED_HAS_ARG_LIST is set. argument_end comes
* from the bytecode header and must not be used on its own to decide this, or a
* crafted snapshot makes us read past a plain vm_frame_ctx_shared_t. */
if (argument_end > 0 && (shared_p->status_flags & VM_FRAME_CTX_SHARED_HAS_ARG_LIST))
{
JERRY_ASSERT (shared_p->status_flags & VM_FRAME_CTX_SHARED_HAS_ARG_LIST);

const ecma_value_t *arg_list_p = ((vm_frame_ctx_shared_args_t *) shared_p)->arg_list_p;
arg_list_len = ((vm_frame_ctx_shared_args_t *) shared_p)->arg_list_len;

Expand Down