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

'exit' changed to 'abort' in case of panic (+ some extra comments)

Browse Source 
'abort' seems more in line with panic ("abnormal termination")
This commit is contained in:
Roberto Ierusalimschy
2009-04-26 18:55:35 -03:00
parent d3037d97ec
commit e5249b9fb5
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ldo.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: ldo.c,v 2.60 2009/04/17 14:28:06 roberto Exp roberto $ ** $Id: ldo.c,v 2.61 2009/04/17 22:00:01 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
*/ */
@@ -76,22 +76,22 @@ static void restore_stack_limit (lua_State *L) {
void luaD_throw (lua_State *L, int errcode) { void luaD_throw (lua_State *L, int errcode) {
if (L->errorJmp) { if (L->errorJmp) { /* thread has an error handler? */
L->errorJmp->status = errcode; L->errorJmp->status = errcode; /* set status */
LUAI_THROW(L, L->errorJmp); LUAI_THROW(L, L->errorJmp); /* jump to it */
} }
else { /* thread has no error handler */ else { /* thread has no error handler */
L->status = cast_byte(errcode); /* mark it as dead */ L->status = cast_byte(errcode); /* mark it as dead */
if (G(L)->mainthread->errorJmp) { /* main thread has a handler? */ if (G(L)->mainthread->errorJmp) { /* main thread has a handler? */
setobjs2s(L, G(L)->mainthread->top++, L->top - 1); /* copy error obj. */ setobjs2s(L, G(L)->mainthread->top++, L->top - 1); /* copy error obj. */
luaD_throw(G(L)->mainthread, errcode); /* jump to it */ luaD_throw(G(L)->mainthread, errcode); /* re-throw in main thread */
} }
else { else { /* no handler at all; abort */
if (G(L)->panic) { if (G(L)->panic) { /* panic function? */
lua_unlock(L); lua_unlock(L);
G(L)->panic(L); G(L)->panic(L); /* call it (last chance to jump out) */
} }
exit(EXIT_FAILURE); abort();
} }
} }
} }