24 lines
972 B
Diff
24 lines
972 B
Diff
diff -up lua-5.4.0/src/ldebug.c.CVE-2020-24370 lua-5.4.0/src/ldebug.c
|
|
--- lua-5.4.0/src/ldebug.c.CVE-2020-24370 2020-08-19 13:25:29.295135397 -0400
|
|
+++ lua-5.4.0/src/ldebug.c 2020-08-19 13:25:35.012135113 -0400
|
|
@@ -188,8 +188,8 @@ static const char *upvalname (const Prot
|
|
static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
|
|
if (clLvalue(s2v(ci->func))->p->is_vararg) {
|
|
int nextra = ci->u.l.nextraargs;
|
|
- if (n <= nextra) {
|
|
- *pos = ci->func - nextra + (n - 1);
|
|
+ if (n >= -nextra) { /* 'n' is negative */
|
|
+ *pos = ci->func - nextra - (n + 1);
|
|
return "(vararg)"; /* generic name for any vararg */
|
|
}
|
|
}
|
|
@@ -202,7 +202,7 @@ const char *luaG_findlocal (lua_State *L
|
|
const char *name = NULL;
|
|
if (isLua(ci)) {
|
|
if (n < 0) /* access to vararg values? */
|
|
- return findvararg(ci, -n, pos);
|
|
+ return findvararg(ci, n, pos);
|
|
else
|
|
name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
|
|
}
|