gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add assertions to guard against using lua_*call on dead coroutines.

Browse Source
This commit is contained in:
Mike Pall 2010-04-23 17:42:25 +02:00
parent a6c52d80a2
commit 28a6284642
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lj_api.c
View File

@ -997,6 +997,7 @@ LUA_API const char *lua_setupvalue(lua_State *L, int idx, int n)
LUA_API void lua_call(lua_State *L, int nargs, int nresults) LUA_API void lua_call(lua_State *L, int nargs, int nresults)
{ {
api_check(L, L->status == 0 || L->status == LUA_ERRERR);
api_checknelems(L, nargs+1); api_checknelems(L, nargs+1);
lj_vm_call(L, L->top - nargs, nresults+1); lj_vm_call(L, L->top - nargs, nresults+1);
} }
@ -1007,6 +1008,7 @@ LUA_API int lua_pcall(lua_State *L, int nargs, int nresults, int errfunc)
uint8_t oldh = hook_save(g); uint8_t oldh = hook_save(g);
ptrdiff_t ef; ptrdiff_t ef;
int status; int status;
api_check(L, L->status == 0 || L->status == LUA_ERRERR);
api_checknelems(L, nargs+1); api_checknelems(L, nargs+1);
if (errfunc == 0) { if (errfunc == 0) {
ef = 0; ef = 0;
@ -1022,8 +1024,7 @@ LUA_API int lua_pcall(lua_State *L, int nargs, int nresults, int errfunc)
static TValue *cpcall(lua_State *L, lua_CFunction func, void *ud) static TValue *cpcall(lua_State *L, lua_CFunction func, void *ud)
{ {
GCfunc *fn; GCfunc *fn = lj_func_newC(L, 0, getcurrenv(L));
fn = lj_func_newC(L, 0, getcurrenv(L));
fn->c.f = func; fn->c.f = func;
setfuncV(L, L->top, fn); setfuncV(L, L->top, fn);
setlightudV(L->top+1, checklightudptr(L, ud)); setlightudV(L->top+1, checklightudptr(L, ud));
@ -1036,7 +1037,9 @@ LUA_API int lua_cpcall(lua_State *L, lua_CFunction func, void *ud)
{ {
global_State *g = G(L); global_State *g = G(L);
uint8_t oldh = hook_save(g); uint8_t oldh = hook_save(g);
int status = lj_vm_cpcall(L, func, ud, cpcall); int status;
api_check(L, L->status == 0 || L->status == LUA_ERRERR);
status = lj_vm_cpcall(L, func, ud, cpcall);
if (status) hook_restore(g, oldh); if (status) hook_restore(g, oldh);
return status; return status;
} }