using explicit tests for allocation overflow whenever possible

This commit is contained in:
Roberto Ierusalimschy
2017-12-07 16:59:52 -02:00
parent 46bc7f2bf7
commit 7622373033
5 changed files with 80 additions and 46 deletions

View File

@@ -1,5 +1,5 @@
/*
** $Id: lstring.c,v 2.57 2017/07/27 13:50:16 roberto Exp roberto $
** $Id: lstring.c,v 2.58 2017/12/01 16:40:29 roberto Exp roberto $
** String table (keeps all strings handled by Lua)
** See Copyright Notice in lua.h
*/
@@ -31,6 +31,13 @@
#endif
/*
** Maximum size for string table.
*/
#define MAXSTRTB cast_int(luaM_limitN(MAX_INT, TString*))
/*
** equality for long strings
*/
@@ -173,7 +180,8 @@ static TString *internshrstr (lua_State *L, const char *str, size_t l) {
return ts;
}
}
if (g->strt.nuse >= g->strt.size && g->strt.size <= MAX_INT/2) {
if (g->strt.nuse >= g->strt.size &&
g->strt.size <= MAXSTRTB / 2) {
luaS_resize(L, g->strt.size * 2);
list = &g->strt.hash[lmod(h, g->strt.size)]; /* recompute with new size */
}