diff --git a/client/deps/liblua/ltablib.c b/client/deps/liblua/ltablib.c index db8ee7f62..9d9be1077 100644 --- a/client/deps/liblua/ltablib.c +++ b/client/deps/liblua/ltablib.c @@ -4,7 +4,7 @@ ** See Copyright Notice in lua.h */ - +#include #include #define ltablib_c @@ -134,14 +134,18 @@ static int pack(lua_State *L) { static int unpack(lua_State *L) { - int i, e, n; + int i, e; + unsigned int n; luaL_checktype(L, 1, LUA_TTABLE); i = luaL_optint(L, 2, 1); e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1)); if (i > e) return 0; /* empty range */ - n = e - i + 1; /* number of elements */ - if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */ + + n = (unsigned int)e - (unsigned int)i; /* number of elements minus 1 */ + + if (n > (INT_MAX - 10) || !lua_checkstack(L, ++n)) return luaL_error(L, "too many results to unpack"); + lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */ while (i++ < e) /* push arg[i + 1...e] */ lua_rawgeti(L, 1, i);