Skip to content

Commit 380daf1

Browse files
Backport CVE-2020-24370's patch (#16190)
1 parent 92608cb commit 380daf1

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

deps/lua/src/ldebug.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,11 @@ static const char *upvalname (Proto *p, int uv) {
133133

134134
static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
135135
int nparams = clLvalue(ci->func)->p->numparams;
136-
if (n >= cast_int(ci->u.l.base - ci->func) - nparams)
136+
int nvararg = cast_int(ci->u.l.base - ci->func) - nparams;
137+
if (n <= -nvararg)
137138
return NULL; /* no such vararg */
138139
else {
139-
*pos = ci->func + nparams + n;
140+
*pos = ci->func + nparams - n;
140141
return "(*vararg)"; /* generic name for any vararg */
141142
}
142143
}
@@ -148,7 +149,7 @@ static const char *findlocal (lua_State *L, CallInfo *ci, int n,
148149
StkId base;
149150
if (isLua(ci)) {
150151
if (n < 0) /* access to vararg values? */
151-
return findvararg(ci, -n, pos);
152+
return findvararg(ci, n, pos);
152153
else {
153154
base = ci->u.l.base;
154155
name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));

0 commit comments

Comments
 (0)