commit b9a1f27250efd0433b93d23b92da19566f9b78e1
parent 29aed2880229fa9b9a0284db8a0bd4db76375f7e
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Tue, 3 Mar 2015 15:18:04 -0300
do not attempt emergency collection while building state (it is
useless, and state can be inconsistent)
Diffstat:
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lmem.c b/lmem.c
@@ -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);
}