nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'coroutine.close'/'lua_resetthread' report original errors

Browse Source 
Besides errors in closing methods, 'coroutine.close' and
'lua_resetthread' also consider the original error that stopped the
thread, if any.
This commit is contained in:
Roberto Ierusalimschy
2020-12-18 11:22:42 -03:00
parent b17178b27a
commit 409256b784
5 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lstate.c
View File

@@ -323,14 +323,16 @@ void luaE_freethread (lua_State *L, lua_State *L1) {
int lua_resetthread (lua_State *L) {
CallInfo *ci;
int status;
int status = L->status;
lua_lock(L);
L->ci = ci = &L->base_ci; /* unwind CallInfo list */
setnilvalue(s2v(L->stack)); /* 'function' entry for basic 'ci' */
ci->func = L->stack;
ci->callstatus = CIST_C;
status = luaF_close(L, L->stack, CLOSEPROTECT);
if (status != CLOSEPROTECT) /* real errors? */
if (status == LUA_OK || status == LUA_YIELD)
status = CLOSEPROTECT; /* run closing methods in protected mode */
status = luaF_close(L, L->stack, status);
if (status != CLOSEPROTECT) /* errors? */
luaD_seterrorobj(L, status, L->stack + 1);
else {
status = LUA_OK;