mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 12:41:00 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: lua: executes the function destroying the Lua session in safe mode

Browse Source 
When we destroy the Lua session, we manipulates Lua stack,
so errors can raises. It will be better to catch these errors.

This patch should be backported in 1.6 and 1.7
This commit is contained in:
Thierry FOURNIER 2017-07-12 13:41:33 +02:00 committed by Willy Tarreau
parent 0a97620c08
commit 75d0208009
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hlua.c
View File

@ -882,9 +882,15 @@ void hlua_ctx_destroy(struct hlua *lua)
/* Purge all the pending signals. */
hlua_com_purge(&lua->com);
if (!SET_SAFE_LJMP(lua->T))
return;
luaL_unref(lua->T, LUA_REGISTRYINDEX, lua->Mref);
luaL_unref(gL.T, LUA_REGISTRYINDEX, lua->Tref);
RESET_SAFE_LJMP(lua->T);
if (!SET_SAFE_LJMP(gL.T))
return;
luaL_unref(gL.T, LUA_REGISTRYINDEX, lua->Tref);
RESET_SAFE_LJMP(gL.T);
/* Forces a garbage collecting process. If the Lua program is finished
* without error, we run the GC on the thread pointer. Its freed all
* the unused memory.
@ -895,9 +901,16 @@ void hlua_ctx_destroy(struct hlua *lua)
* the garbage collection.
*/
if (lua->flags & HLUA_MUST_GC) {
if (!SET_SAFE_LJMP(lua->T))
return;
lua_gc(lua->T, LUA_GCCOLLECT, 0);
if (lua_status(lua->T) != LUA_OK)
RESET_SAFE_LJMP(lua->T);
if (lua_status(lua->T) != LUA_OK) {
if (!SET_SAFE_LJMP(gL.T))
return;
lua_gc(gL.T, LUA_GCCOLLECT, 0);
RESET_SAFE_LJMP(gL.T);
}
}
lua->T = NULL;