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

in return hook, 'top' must be corrected only if smaller than 'ci->top'. 

(It may be larger when returning multiple values, and then it must
be larger to preserve that stack slice.)
This commit is contained in:
Roberto Ierusalimschy 2018-02-17 16:22:00 -02:00
parent c7a8cba745
commit 104d249ffb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ldo.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ldo.c,v 2.193 2018/02/09 15:16:06 roberto Exp roberto $ ** $Id: ldo.c,v 2.194 2018/02/15 15:34:29 roberto Exp roberto $
** Stack and Call structure of Lua ** Stack and Call structure of Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -316,7 +316,8 @@ static void rethook (lua_State *L, CallInfo *ci) {
Proto *p = clLvalue(s2v(ci->func))->p; Proto *p = clLvalue(s2v(ci->func))->p;
if (p->is_vararg) if (p->is_vararg)
delta = ci->u.l.nextraargs + p->numparams + 1; delta = ci->u.l.nextraargs + p->numparams + 1;
L->top = ci->top; /* prepare top */ if (L->top < ci->top)
L->top = ci->top; /* correct top */
} }
if (L->hookmask & LUA_MASKRET) { /* is return hook on? */ if (L->hookmask & LUA_MASKRET) { /* is return hook on? */
ci->func += delta; /* if vararg, back to virtual 'func' */ ci->func += delta; /* if vararg, back to virtual 'func' */