summaryrefslogtreecommitdiff
path: root/src/lmem.c
diff options
context:
space:
mode:
authorLua Team <team@lua.org>2015-06-03 12:00:00 +0000
committerrepogen <>2015-06-03 12:00:00 +0000
commit6ddf2b3ca86471f90439976967c9e608582f0d0b (patch)
tree7fa563fe4062fcea38b86adfe8a26ac413f0d97b /src/lmem.c
parent34c362812ab38172d3da36404ec9a85f929579c5 (diff)
downloadlua-github-5.3.1-rc1.tar.gz
Lua 5.3.1-rc15.3.1-rc1
Diffstat (limited to 'src/lmem.c')
-rw-r--r--src/lmem.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lmem.c b/src/lmem.c
index 4feaf036..0a0476cc 100644
--- a/src/lmem.c
+++ b/src/lmem.c
@@ -1,5 +1,5 @@
/*
-** $Id: lmem.c,v 1.89 2014/11/02 19:33:33 roberto Exp $
+** $Id: lmem.c,v 1.91 2015/03/06 19:45:54 roberto Exp $
** Interface to Memory Manager
** See Copyright Notice in lua.h
*/
@@ -85,10 +85,11 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
#endif
newblock = (*g->frealloc)(g->ud, block, osize, 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 */
+ lua_assert(nsize > realosize); /* cannot fail when shrinking a block */
+ 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);
}