gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: Pass scratch CONTEXT record to RtlUnwindEx.

Browse Source 
Thanks to Peter Cawley. #593
This commit is contained in:
Mike Pall 2023-09-15 05:31:26 +02:00
parent 18b8fd8de7
commit 7a1c139569
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lj_err.c
View File

@ -285,8 +285,8 @@ LJ_FUNCA int lj_err_unwind_win(EXCEPTION_RECORD *rec,
/* Don't catch access violations etc. */ /* Don't catch access violations etc. */
return 1; /* ExceptionContinueSearch */ return 1; /* ExceptionContinueSearch */
} }
#if LJ_TARGET_X86
UNUSED(ctx); UNUSED(ctx);
#if LJ_TARGET_X86
UNUSED(dispatch); UNUSED(dispatch);
/* Call all handlers for all lower C frames (including ourselves) again /* Call all handlers for all lower C frames (including ourselves) again
** with EH_UNWINDING set. Then call the specified function, passing cf ** with EH_UNWINDING set. Then call the specified function, passing cf
@ -304,7 +304,8 @@ LJ_FUNCA int lj_err_unwind_win(EXCEPTION_RECORD *rec,
RtlUnwindEx(f, (void *)((cframe_unwind_ff(cf2) && errcode != LUA_YIELD) ? RtlUnwindEx(f, (void *)((cframe_unwind_ff(cf2) && errcode != LUA_YIELD) ?
lj_vm_unwind_ff_eh : lj_vm_unwind_ff_eh :
lj_vm_unwind_c_eh), lj_vm_unwind_c_eh),
rec, (void *)(uintptr_t)errcode, ctx, dispatch->HistoryTable); rec, (void *)(uintptr_t)errcode, dispatch->ContextRecord,
dispatch->HistoryTable);
/* RtlUnwindEx should never return. */ /* RtlUnwindEx should never return. */
#endif #endif
} }