From 54ce282b8cb518ce4498863fbfcf0f6b831617b8 Mon Sep 17 00:00:00 2001 From: kaixindeken Date: Fri, 18 Aug 2023 11:37:14 +0800 Subject: Avoid wild pointer error for my_context->elfs --- src/emu/x64run_private.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/emu/x64run_private.c b/src/emu/x64run_private.c index e4213371..671034b6 100644 --- a/src/emu/x64run_private.c +++ b/src/emu/x64run_private.c @@ -53,9 +53,13 @@ int32_t EXPORT my___libc_start_main(x64emu_t* emu, int *(main) (int, char * *, c SetRBP(emu, old_rbp); emu->quit = 0; } else { - RunElfInit(my_context->elfs[0], emu); + if(my_context->elfs[0]) { + RunElfInit(my_context->elfs[0], emu); + } + } + if(my_context->elfs[0]) { + MarkElfInitDone(my_context->elfs[0]); } - MarkElfInitDone(my_context->elfs[0]); printf_log(LOG_DEBUG, "Transfert to main(%d, %p, %p)=>%p from __libc_start_main\n", my_context->argc, my_context->argv, my_context->envv, main); // call main and finish Push64(emu, GetRBP(emu)); // set frame pointer -- cgit 1.4.1