rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug of access violation in finalizers 

Errors in finalizers need a valid 'pc' to produce an error message,
even if the error is not propagated. Therefore, calls to the GC (which
may call finalizers) inside luaV_execute must save the 'pc'.
This commit is contained in:
Roberto Ierusalimschy 2020-07-08 12:02:56 -03:00
parent eb41999461
commit 31b8c2d438
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lvm.c
View File

@ -1101,9 +1101,9 @@ void luaV_finishOp (lua_State *L) {
/* idem, but without changing the stack */ /* idem, but without changing the stack */
#define halfProtectNT(exp) (savepc(L), (exp)) #define halfProtectNT(exp) (savepc(L), (exp))
/* 'c' is the limit of live values in the stack */
#define checkGC(L,c) \ #define checkGC(L,c) \
{ luaC_condGC(L, L->top = (c), /* limit of live values */ \ { luaC_condGC(L, (savepc(L), L->top = (c)), \
updatetrap(ci)); \ updatetrap(ci)); \
luai_threadyield(L); } luai_threadyield(L); }
@ -1791,8 +1791,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
vmbreak; vmbreak;
} }
vmcase(OP_VARARGPREP) { vmcase(OP_VARARGPREP) {
luaT_adjustvarargs(L, GETARG_A(i), ci, cl->p); ProtectNT(luaT_adjustvarargs(L, GETARG_A(i), ci, cl->p));
updatetrap(ci);
if (trap) { if (trap) {
luaD_hookcall(L, ci); luaD_hookcall(L, ci);
L->oldpc = pc + 1; /* next opcode will be seen as a "new" line */ L->oldpc = pc + 1; /* next opcode will be seen as a "new" line */