mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-28 17:21:32 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: hlua: Fix memory leaks on error path when registering a task

Browse Source 
When an error occurred in hlua_register_task(), the allocated lua context
and task must be released to avoid memory leaks.

This patch may be backported in all stable versions.
This commit is contained in:
Christopher Faulet 2021-04-12 12:24:47 +02:00
parent dda44442d5
commit 5294ec0708
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hlua.c
View File

@ -6402,8 +6402,8 @@ __LJMP static int hlua_register_init(lua_State *L)
*/ */
static int hlua_register_task(lua_State *L) static int hlua_register_task(lua_State *L)
{ {
struct hlua *hlua; struct hlua *hlua = NULL;
struct task *task; struct task *task = NULL;
int ref; int ref;
int state_id; int state_id;
@ -6424,7 +6424,7 @@ static int hlua_register_task(lua_State *L)
hlua = pool_alloc(pool_head_hlua); hlua = pool_alloc(pool_head_hlua);
if (!hlua) if (!hlua)
WILL_LJMP(luaL_error(L, "Lua out of memory error.")); goto alloc_error;
HLUA_INIT(hlua); HLUA_INIT(hlua);
/* We are in the common lua state, execute the task anywhere, /* We are in the common lua state, execute the task anywhere,
@ -6435,13 +6435,13 @@ static int hlua_register_task(lua_State *L)
else else
task = task_new(tid_bit); task = task_new(tid_bit);
if (!task) if (!task)
WILL_LJMP(luaL_error(L, "Lua out of memory error.")); goto alloc_error;
task->context = hlua; task->context = hlua;
task->process = hlua_process_task; task->process = hlua_process_task;
if (!hlua_ctx_init(hlua, state_id, task, 1)) if (!hlua_ctx_init(hlua, state_id, task, 1))
WILL_LJMP(luaL_error(L, "Lua out of memory error.")); goto alloc_error;
/* Restore the function in the stack. */ /* Restore the function in the stack. */
lua_rawgeti(hlua->T, LUA_REGISTRYINDEX, ref); lua_rawgeti(hlua->T, LUA_REGISTRYINDEX, ref);
@ -6451,6 +6451,12 @@ static int hlua_register_task(lua_State *L)
task_schedule(task, now_ms); task_schedule(task, now_ms);
return 0; return 0;
alloc_error:
task_destroy(task);
hlua_ctx_destroy(hlua);
WILL_LJMP(luaL_error(L, "Lua out of memory error."));
return 0; /* Never reached */
} }
/* Wrapper called by HAProxy to execute an LUA converter. This wrapper /* Wrapper called by HAProxy to execute an LUA converter. This wrapper