c/civetweb
1
0
Fork 0
mirror of https://github.com/civetweb/civetweb synced 2025-03-28 21:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly generate traceback in lua_error_handler() avoiding the first line showing the manual call to debug.traceback() itself

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2024-09-23 20:35:54 +02:00
parent b02d56d6d0
commit 0f6a77d460
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mod_lua.inl
View File

@ -2796,13 +2796,33 @@ lua_error_handler(lua_State *L)
lua_getglobal(L, "mg");
if (!lua_isnil(L, -1)) {
lua_getfield(L, -1, "write"); /* call mg.write() */
/* Write the error message to the error log */
lua_getfield(L, -1, "write");
lua_pushstring(L, error_msg);
lua_pushliteral(L, "\n");
lua_call(L, 2, 0);
IGNORE_UNUSED_RESULT(
luaL_dostring(L, "mg.write(debug.traceback(), '\\n')"));
lua_call(L, 2, 0); /* call mg.write(error_msg + \n) */
lua_pop(L, 1); /* pop mg */
/* Get Lua traceback */
lua_getglobal(L, "debug");
lua_getfield(L, -1, "traceback");
lua_call(L, 0, 1); /* call debug.traceback() */
lua_remove(L, -2); /* remove debug */
/* Write the Lua traceback to the error log */
lua_getglobal(L, "mg");
lua_getfield(L, -1, "write");
lua_pushvalue(L, -3); /* push the traceback */
/* Only print the traceback if it is not empty */
if (strcmp(lua_tostring(L, -1), "stack traceback:") != 0) {
lua_pushliteral(L, "\n"); /* append a newline */
lua_call(L, 2, 0); /* call mg.write(traceback + \n) */
lua_pop(L, 2); /* pop mg and traceback */
} else {
lua_pop(L, 3); /* pop mg, traceback and error message */
}
} else {
printf("Lua error: [%s]\n", error_msg);
IGNORE_UNUSED_RESULT(