summaryrefslogtreecommitdiff
path: root/lmem.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2014-06-26 15:29:05 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2014-06-26 15:29:05 -0300
commit7cc40851e1d1a18a4c45fca31dbccd4206050b11 (patch)
treebc7eccc4e27849e9d8c932a6638ce455760f461e /lmem.c
parent08a9c9faa39c27bd7a9fe6080481f21d455e7cd3 (diff)
downloadlua-github-7cc40851e1d1a18a4c45fca31dbccd4206050b11.tar.gz
emergency collection can happen even when collector is stopped
Diffstat (limited to 'lmem.c')
-rw-r--r--lmem.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lmem.c b/lmem.c
index e422a6e2..267e269f 100644
--- a/lmem.c
+++ b/lmem.c
@@ -1,5 +1,5 @@
/*
-** $Id: lmem.c,v 1.83 2011/11/30 12:42:49 roberto Exp roberto $
+** $Id: lmem.c,v 1.84 2012/05/23 15:41:53 roberto Exp roberto $
** Interface to Memory Manager
** See Copyright Notice in lua.h
*/
@@ -85,10 +85,8 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
if (newblock == NULL && nsize > 0) {
api_check(L, nsize > realosize,
"realloc cannot fail when shrinking a block");
- if (g->gcrunning) {
- luaC_fullgc(L, 1); /* try to free some memory... */
- newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */
- }
+ 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);
}