upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-07-15 20:03:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

BUG/MINOR: http_htx: Fix some leaks on error path when error files are loaded

Browse source 
No backports needed. This patch partially fixes the issue #457.
This commit is contained in:
Christopher Faulet 2020-01-21 10:10:11 +01:00
parent 224a087a27
commit 7cde96c829
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/http_htx.c
View file

@ -946,6 +946,7 @@ struct buffer *http_load_errorfile(const char *file, char **errmsg)
http_err->node.key = strdup(file);
if (!http_err->node.key) {
memprintf(errmsg, "out of memory.");
free(http_err);
goto out;
}
@ -996,6 +997,7 @@ struct buffer *http_load_errormsg(const char *key, const struct ist msg, char **
http_err->node.key = strdup(key);
if (!http_err->node.key) {
memprintf(errmsg, "out of memory.");
free(http_err);
goto out;
}
@ -1199,7 +1201,6 @@ static int proxy_parse_errorfiles(char **args, int section, struct proxy *curpx,
conf_err = calloc(1, sizeof(*conf_err));
if (!name || !conf_err) {
memprintf(err, "%s : out of memory.", args[0]);
ret = -1;
goto error;
}
conf_err->type = 0;
@ -1222,8 +1223,7 @@ static int proxy_parse_errorfiles(char **args, int section, struct proxy *curpx,
}
if (rc >= HTTP_ERR_SIZE) {
memprintf(err, "%s : status code '%d' not handled.", args[0], status);
ret = -1;
goto out;
goto error;
}
}
}
@ -1236,6 +1236,7 @@ static int proxy_parse_errorfiles(char **args, int section, struct proxy *curpx,
error:
free(name);
free(conf_err);
ret = -1;
goto out;
}