mirror of https://github.com/rusefi/lua.git
if thread has no error handling, try main thread handler before panicking
This commit is contained in:
parent
facfcd497f
commit
910310d3ba
20
ldo.c
20
ldo.c
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
** $Id: ldo.c,v 2.51 2008/11/06 12:43:51 roberto Exp roberto $
|
** $Id: ldo.c,v 2.52 2009/02/18 14:52:03 roberto Exp roberto $
|
||||||
** Stack and Call structure of Lua
|
** Stack and Call structure of Lua
|
||||||
** See Copyright Notice in lua.h
|
** See Copyright Notice in lua.h
|
||||||
*/
|
*/
|
||||||
|
@ -83,13 +83,19 @@ void luaD_throw (lua_State *L, int errcode) {
|
||||||
L->errorJmp->status = errcode;
|
L->errorJmp->status = errcode;
|
||||||
LUAI_THROW(L, L->errorJmp);
|
LUAI_THROW(L, L->errorJmp);
|
||||||
}
|
}
|
||||||
else {
|
else { /* thread has no error handler */
|
||||||
L->status = cast_byte(errcode);
|
L->status = cast_byte(errcode); /* mark it as dead */
|
||||||
if (G(L)->panic) {
|
if (G(L)->mainthread->errorJmp) { /* main thread has a handler? */
|
||||||
lua_unlock(L);
|
setobjs2s(L, G(L)->mainthread->top++, L->top - 1); /* copy error obj. */
|
||||||
G(L)->panic(L);
|
luaD_throw(G(L)->mainthread, errcode); /* jump to it */
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (G(L)->panic) {
|
||||||
|
lua_unlock(L);
|
||||||
|
G(L)->panic(L);
|
||||||
|
}
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue