GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-02-04 06:13:04 +08:00
Code Issues Projects Releases Wiki Activity

avoid an unprotected call to 'lua_tostring' which theoretically may

Browse Source 
cause a panicked exit
This commit is contained in:
Roberto Ierusalimschy 2009-08-10 13:23:19 -03:00
parent 1b4480003b
commit bc439e21cd
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lua.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.173 2009/06/18 18:59:58 roberto Exp roberto $ ** $Id: lua.c,v 1.174 2009/07/15 17:35:20 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -75,6 +75,18 @@ static int report (lua_State *L, int status) {
} }
/* the next function is called unprotected, so it must avoid errors */
static void finalreport (lua_State *L, int status) {
if (status != LUA_OK) {
const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
: NULL;
if (msg == NULL) msg = "(error object is not a string)";
l_message(progname, msg);
lua_pop(L, 1);
}
}
static int traceback (lua_State *L) { static int traceback (lua_State *L) {
const char *msg = lua_tostring(L, 1); const char *msg = lua_tostring(L, 1);
if (msg) if (msg)
@ -383,7 +395,7 @@ int main (int argc, char **argv) {
s.argc = argc; s.argc = argc;
s.argv = argv; s.argv = argv;
status = lua_cpcall(L, &pmain, &s); status = lua_cpcall(L, &pmain, &s);
report(L, status); finalreport(L, status);
lua_close(L); lua_close(L);
return (s.ok && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE; return (s.ok && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
} }