bug: GC step could loop forever under very particular circumstances

This commit is contained in:
Roberto Ierusalimschy
2008-07-04 15:27:11 -03:00
parent 1ceec74370
commit 5298392c5a

14
lapi.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lapi.c,v 2.65 2008/02/14 16:02:58 roberto Exp roberto $ ** $Id: lapi.c,v 2.66 2008/02/19 18:55:09 roberto Exp roberto $
** Lua API ** Lua API
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -907,16 +907,16 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
} }
case LUA_GCSTEP: { case LUA_GCSTEP: {
lu_mem a = (cast(lu_mem, data) << 10); lu_mem a = (cast(lu_mem, data) << 10);
if (a <= g->totalbytes) g->GCthreshold = (a <= g->totalbytes) ? g->totalbytes - a : 0;
g->GCthreshold = g->totalbytes - a; while (g->GCthreshold <= g->totalbytes) {
else
g->GCthreshold = 0;
while (g->GCthreshold <= g->totalbytes)
luaC_step(L); luaC_step(L);
if (g->gcstate == GCSpause) /* end of cycle? */ if (g->gcstate == GCSpause) { /* end of cycle? */
res = 1; /* signal it */ res = 1; /* signal it */
break; break;
} }
}
break;
}
case LUA_GCSETPAUSE: { case LUA_GCSETPAUSE: {
res = g->gcpause; res = g->gcpause;
g->gcpause = data; g->gcpause = data;