Avoid setting the stack top below upvalues to be closed

When leaving a scope, the new stack top should be set only after
closing any upvalue, to avoid manipulating values in an "invalid"
part of the stack.
This commit is contained in:
Roberto Ierusalimschy
2019-07-16 14:13:22 -03:00
parent 758c1ef445
commit 298f383ffc
3 changed files with 13 additions and 9 deletions

6
lvm.c
View File

@@ -1601,15 +1601,17 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
int n = GETARG_B(i) - 1; /* number of results */
if (n < 0) /* not fixed? */
n = cast_int(L->top - ra); /* get what is available */
else
L->top = ra + n; /* set call for 'luaD_poscall' */
savepc(ci);
if (TESTARG_k(i)) {
int nparams1 = GETARG_C(i);
if (L->top < ci->top)
L->top = ci->top;
luaF_close(L, base, LUA_OK); /* there may be open upvalues */
updatestack(ci);
if (nparams1) /* vararg function? */
ci->func -= ci->u.l.nextraargs + nparams1;
}
L->top = ra + n; /* set call for 'luaD_poscall' */
luaD_poscall(L, ci, n);
return;
}