mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-11 01:26:58 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: lua-thread: close all states on deinit

Browse Source 
It seems to me that lua_close() must be called on all states at deinit
time, not just the first two ones. This is likely a remnant of commit
59f11be43 ("MEDIUM: lua-thread: Add the lua-load-per-thread directive").
There should likely be some memory leak reports when using Lua without
this fix, though none were observed for now.

No backport is needed as this was merged into 2.4-dev.
This commit is contained in:
Willy Tarreau 2020-12-04 11:48:12 +01:00
parent aafc777854
commit 186f37674c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hlua.c
View File

@ -191,7 +191,7 @@ lua_State *hlua_init_state(int thread_id);
/* The main Lua execution context. The 0 index is the
* common state shared by all threads.
*/
lua_State *hlua_states[MAX_THREADS + 1];
static lua_State *hlua_states[MAX_THREADS + 1];
/* This is the memory pool containing struct lua for applets
* (including cli).
@ -9287,8 +9287,12 @@ void hlua_init(void) {
static void hlua_deinit()
{
lua_close(hlua_states[0]);
lua_close(hlua_states[1]);
int thr;
for (thr = 0; thr < MAX_THREADS+1; thr++) {
if (hlua_states[thr])
lua_close(hlua_states[thr]);
}
}
REGISTER_POST_DEINIT(hlua_deinit);