diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2020-08-03 16:25:28 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2020-08-03 16:25:28 -0300 |
commit | b5bc89846721375fe30772eb8c5ab2786f362bf9 (patch) | |
tree | 2a4dd535e38dc79efe6fc2b355b452aa4c5db572 | |
parent | 092f66fb0590f543ee5c45156ddabaddc7222a92 (diff) | |
download | lua-b5bc89846721375fe30772eb8c5ab2786f362bf9.tar.gz lua-b5bc89846721375fe30772eb8c5ab2786f362bf9.tar.bz2 lua-b5bc89846721375fe30772eb8c5ab2786f362bf9.zip |
Fixed bug: Negation overflow in getlocal/setlocal
-rw-r--r-- | ldebug.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -133,10 +133,11 @@ static const char *upvalname (Proto *p, int uv) { | |||
133 | 133 | ||
134 | static const char *findvararg (CallInfo *ci, int n, StkId *pos) { | 134 | static const char *findvararg (CallInfo *ci, int n, StkId *pos) { |
135 | int nparams = clLvalue(ci->func)->p->numparams; | 135 | 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) | ||
137 | return NULL; /* no such vararg */ | 138 | return NULL; /* no such vararg */ |
138 | else { | 139 | else { |
139 | *pos = ci->func + nparams + n; | 140 | *pos = ci->func + nparams - n; |
140 | return "(*vararg)"; /* generic name for any vararg */ | 141 | return "(*vararg)"; /* generic name for any vararg */ |
141 | } | 142 | } |
142 | } | 143 | } |
@@ -148,7 +149,7 @@ static const char *findlocal (lua_State *L, CallInfo *ci, int n, | |||
148 | StkId base; | 149 | StkId base; |
149 | if (isLua(ci)) { | 150 | if (isLua(ci)) { |
150 | if (n < 0) /* access to vararg values? */ | 151 | if (n < 0) /* access to vararg values? */ |
151 | return findvararg(ci, -n, pos); | 152 | return findvararg(ci, n, pos); |
152 | else { | 153 | else { |
153 | base = ci->u.l.base; | 154 | base = ci->u.l.base; |
154 | name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci)); | 155 | name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci)); |