diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-06-26 15:29:05 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-06-26 15:29:05 -0300 |
| commit | 7cc40851e1d1a18a4c45fca31dbccd4206050b11 (patch) | |
| tree | bc7eccc4e27849e9d8c932a6638ce455760f461e | |
| parent | 08a9c9faa39c27bd7a9fe6080481f21d455e7cd3 (diff) | |
| download | lua-7cc40851e1d1a18a4c45fca31dbccd4206050b11.tar.gz lua-7cc40851e1d1a18a4c45fca31dbccd4206050b11.tar.bz2 lua-7cc40851e1d1a18a4c45fca31dbccd4206050b11.zip | |
emergency collection can happen even when collector is stopped
| -rw-r--r-- | lmem.c | 8 |
1 files changed, 3 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lmem.c,v 1.83 2011/11/30 12:42:49 roberto Exp roberto $ | 2 | ** $Id: lmem.c,v 1.84 2012/05/23 15:41:53 roberto Exp roberto $ |
| 3 | ** Interface to Memory Manager | 3 | ** Interface to Memory Manager |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -85,10 +85,8 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) { | |||
| 85 | if (newblock == NULL && nsize > 0) { | 85 | if (newblock == NULL && nsize > 0) { |
| 86 | api_check(L, nsize > realosize, | 86 | api_check(L, nsize > realosize, |
| 87 | "realloc cannot fail when shrinking a block"); | 87 | "realloc cannot fail when shrinking a block"); |
| 88 | if (g->gcrunning) { | 88 | luaC_fullgc(L, 1); /* try to free some memory... */ |
| 89 | luaC_fullgc(L, 1); /* try to free some memory... */ | 89 | newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ |
| 90 | newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ | ||
| 91 | } | ||
| 92 | if (newblock == NULL) | 90 | if (newblock == NULL) |
| 93 | luaD_throw(L, LUA_ERRMEM); | 91 | luaD_throw(L, LUA_ERRMEM); |
| 94 | } | 92 | } |
