41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
diff -up lua-5.4.0/src/ldo.c.bug4 lua-5.4.0/src/ldo.c
|
|
--- lua-5.4.0/src/ldo.c.bug4 2020-07-31 10:46:01.013254618 -0400
|
|
+++ lua-5.4.0/src/ldo.c 2020-07-31 10:47:23.423657317 -0400
|
|
@@ -466,13 +466,13 @@ void luaD_call (lua_State *L, StkId func
|
|
f = fvalue(s2v(func));
|
|
Cfunc: {
|
|
int n; /* number of returns */
|
|
- CallInfo *ci = next_ci(L);
|
|
+ CallInfo *ci;
|
|
checkstackp(L, LUA_MINSTACK, func); /* ensure minimum stack size */
|
|
+ L->ci = ci = next_ci(L);
|
|
ci->nresults = nresults;
|
|
ci->callstatus = CIST_C;
|
|
ci->top = L->top + LUA_MINSTACK;
|
|
ci->func = func;
|
|
- L->ci = ci;
|
|
lua_assert(ci->top <= L->stack_last);
|
|
if (L->hookmask & LUA_MASKCALL) {
|
|
int narg = cast_int(L->top - func) - 1;
|
|
@@ -486,18 +486,18 @@ void luaD_call (lua_State *L, StkId func
|
|
break;
|
|
}
|
|
case LUA_VLCL: { /* Lua function */
|
|
- CallInfo *ci = next_ci(L);
|
|
+ CallInfo *ci;
|
|
Proto *p = clLvalue(s2v(func))->p;
|
|
int narg = cast_int(L->top - func) - 1; /* number of real arguments */
|
|
int nfixparams = p->numparams;
|
|
int fsize = p->maxstacksize; /* frame size */
|
|
checkstackp(L, fsize, func);
|
|
+ L->ci = ci = next_ci(L);
|
|
ci->nresults = nresults;
|
|
ci->u.l.savedpc = p->code; /* starting point */
|
|
ci->callstatus = 0;
|
|
ci->top = func + 1 + fsize;
|
|
ci->func = func;
|
|
- L->ci = ci;
|
|
for (; narg < nfixparams; narg++)
|
|
setnilvalue(s2v(L->top++)); /* complete missing arguments */
|
|
lua_assert(ci->top <= L->stack_last);
|