do not attempt emergency collection while building state (it is

useless, and state can be inconsistent)
This commit is contained in:
Roberto Ierusalimschy 2015-03-03 15:18:29 -03:00
parent 29aed28802
commit b9a1f27250
1 changed files with 5 additions and 3 deletions

4
lmem.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lmem.c,v 1.88 2014/11/02 19:19:04 roberto Exp roberto $ ** $Id: lmem.c,v 1.89 2014/11/02 19:33:33 roberto Exp roberto $
** Interface to Memory Manager ** Interface to Memory Manager
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -87,8 +87,10 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
if (newblock == NULL && nsize > 0) { if (newblock == NULL && nsize > 0) {
api_check( nsize > realosize, api_check( nsize > realosize,
"realloc cannot fail when shrinking a block"); "realloc cannot fail when shrinking a block");
if (g->version) { /* is state fully built? */
luaC_fullgc(L, 1); /* try to free some memory... */ luaC_fullgc(L, 1); /* try to free some memory... */
newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */
}
if (newblock == NULL) if (newblock == NULL)
luaD_throw(L, LUA_ERRMEM); luaD_throw(L, LUA_ERRMEM);
} }