aboutsummaryrefslogtreecommitdiff
path: root/ltests.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2024-01-25 13:52:52 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2024-01-25 13:52:52 -0300
commit108e0bdc8495782544c351b17eaae1411a910e89 (patch)
tree1196b9d9288b38b0be0290e30ec818fa09d06238 /ltests.c
parentb34a97a4af5c9e973915c07dba918d95009e0acd (diff)
parente288c5a91883793d14ed9e9d93464f6ee0b08915 (diff)
downloadlua-108e0bdc8495782544c351b17eaae1411a910e89.tar.gz
lua-108e0bdc8495782544c351b17eaae1411a910e89.tar.bz2
lua-108e0bdc8495782544c351b17eaae1411a910e89.zip
Merge branch 'master' into nextversion
Diffstat (limited to 'ltests.c')
-rw-r--r--ltests.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ltests.c b/ltests.c
index 6de62e52..6081aba6 100644
--- a/ltests.c
+++ b/ltests.c
@@ -73,8 +73,9 @@ static void badexit (const char *fmt, const char *s1, const char *s2) {
73 73
74 74
75static int tpanic (lua_State *L) { 75static int tpanic (lua_State *L) {
76 const char *msg = lua_tostring(L, -1); 76 const char *msg = (lua_type(L, -1) == LUA_TSTRING)
77 if (msg == NULL) msg = "error object is not a string"; 77 ? lua_tostring(L, -1)
78 : "error object is not a string";
78 return (badexit("PANIC: unprotected error in call to Lua API (%s)\n", 79 return (badexit("PANIC: unprotected error in call to Lua API (%s)\n",
79 msg, NULL), 80 msg, NULL),
80 0); /* do not return to Lua */ 81 0); /* do not return to Lua */