diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2015-03-03 15:18:29 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2015-03-03 15:18:29 -0300 |
commit | b9a1f27250efd0433b93d23b92da19566f9b78e1 (patch) | |
tree | bdfd0b71669e3f7a5e9075ede02c0e59eac0a126 /lmem.c | |
parent | 29aed2880229fa9b9a0284db8a0bd4db76375f7e (diff) | |
download | lua-github-b9a1f27250efd0433b93d23b92da19566f9b78e1.tar.gz |
do not attempt emergency collection while building state (it is
useless, and state can be inconsistent)
Diffstat (limited to 'lmem.c')
-rw-r--r-- | lmem.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 ** 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) { api_check( nsize > realosize, "realloc cannot fail when shrinking a block"); - luaC_fullgc(L, 1); /* try to free some memory... */ - newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ + if (g->version) { /* is state fully built? */ + luaC_fullgc(L, 1); /* try to free some memory... */ + newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ + } if (newblock == NULL) luaD_throw(L, LUA_ERRMEM); } |