mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-07 02:11:34 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: server: do not leak default-server in defaults sections

Browse Source 
When a default-server directive is used in a defaults section, it's never
freed and the "defaults" proxy gets reset without freeing the fields from
that default-server. Normally there are no allocation there, except for
the config file location stored in srv->conf.file form an strdup() since
commit 9394a9444 ("REORG: server: move alert traces in parse_server")
that appeared in 2.4. In addition, if a "default-server" directive
appears multiple times in a defaults section, one more entry will be
leaked per call.

This commit addresses this by checking that we don't overwrite the file
upon multiple calls, and by clearing it when resetting the default proxy.
This should be backported to 2.4.
This commit is contained in:
Willy Tarreau 2023-11-23 14:28:14 +01:00
parent 7fc52357cb
commit 53da8bfcb6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/proxy.c
View File

@ -1517,6 +1517,7 @@ void proxy_free_defaults(struct proxy *defproxy)
ha_free(&defproxy->id);
ha_free(&defproxy->conf.file);
ha_free((char **)&defproxy->defsrv.conf.file);
ha_free(&defproxy->check_command);
ha_free(&defproxy->check_path);
ha_free(&defproxy->cookie_name);

3
src/server.c
View File

@ -3292,7 +3292,8 @@ int parse_server(const char *file, int linenum, char **args,
if (err_code & ERR_CODE)
goto out;
newsrv->conf.file = strdup(file);
if (!newsrv->conf.file) // note: do it only once for default-server
newsrv->conf.file = strdup(file);
newsrv->conf.line = linenum;
while (*args[cur_arg]) {