RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-03 00:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: lua: memleak when Lua/cli fails

Browse Source 
If the memory allocator fails, it return a bad code, and the execution
continue. If the Lua/cli initializer fails, the allocated struct is not
released.
This commit is contained in:
Thierry FOURNIER 2016-12-17 12:09:51 +01:00 committed by Willy Tarreau
parent 33558c4a3f
commit 1be34152da
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hlua.c
View File

@ -6665,7 +6665,7 @@ static int hlua_cli_parse_fct(char **args, struct appctx *appctx, void *private)
hlua = pool_alloc2(pool2_hlua); hlua = pool_alloc2(pool2_hlua);
if (!hlua) { if (!hlua) {
SEND_ERR(NULL, "Lua cli '%s': out of memory.\n", fcn->name); SEND_ERR(NULL, "Lua cli '%s': out of memory.\n", fcn->name);
return 0; return 1;
} }
HLUA_INIT(hlua); HLUA_INIT(hlua);
appctx->ctx.hlua_cli.hlua = hlua; appctx->ctx.hlua_cli.hlua = hlua;
@ -6677,7 +6677,7 @@ static int hlua_cli_parse_fct(char **args, struct appctx *appctx, void *private)
appctx->ctx.hlua_cli.task = task_new(); appctx->ctx.hlua_cli.task = task_new();
if (!appctx->ctx.hlua_cli.task) { if (!appctx->ctx.hlua_cli.task) {
SEND_ERR(NULL, "Lua cli '%s': out of memory.\n", fcn->name); SEND_ERR(NULL, "Lua cli '%s': out of memory.\n", fcn->name);
return 1; goto error;
} }
appctx->ctx.hlua_cli.task->nice = 0; appctx->ctx.hlua_cli.task->nice = 0;
appctx->ctx.hlua_cli.task->context = appctx; appctx->ctx.hlua_cli.task->context = appctx;
@ -6686,7 +6686,7 @@ static int hlua_cli_parse_fct(char **args, struct appctx *appctx, void *private)
/* Initialises the Lua context */ /* Initialises the Lua context */
if (!hlua_ctx_init(hlua, appctx->ctx.hlua_cli.task)) { if (!hlua_ctx_init(hlua, appctx->ctx.hlua_cli.task)) {
SEND_ERR(NULL, "Lua cli '%s': can't initialize Lua context.\n", fcn->name); SEND_ERR(NULL, "Lua cli '%s': can't initialize Lua context.\n", fcn->name);
return 1; goto error;
} }
/* The following Lua calls can fail. */ /* The following Lua calls can fail. */
@ -6741,6 +6741,8 @@ static int hlua_cli_parse_fct(char **args, struct appctx *appctx, void *private)
error: error:
RESET_SAFE_LJMP(hlua->T); RESET_SAFE_LJMP(hlua->T);
hlua_ctx_destroy(hlua); hlua_ctx_destroy(hlua);
pool_free2(pool2_hlua, hlua);
appctx->ctx.hlua_cli.hlua = NULL;
return 1; return 1;
} }