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

BUG/MINOR: ssl: crt-ignore-err memory leak with 'all' parameter

Browse Source 
Only allocate "str" if the parameter is not "all" in order to avoid any
memory leak.

No backport needed.
This commit is contained in:
William Lallemand 2022-11-14 11:36:11 +01:00
parent 380085dfc1
commit f813dab175
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cfgparse-ssl.c
View File

@ -836,15 +836,6 @@ static int bind_parse_ignore_err(char **args, int cur_arg, struct proxy *px, str
return ERR_ALERT | ERR_FATAL;
}
/* copy the string to be able to dump the complete one in case of
* error, because strtok_r is writing \0 inside. */
str = strdup(p);
if (!str) {
memprintf(err, "'%s' : Could not allocate memory", args[cur_arg]);
return ERR_ALERT | ERR_FATAL;
}
if (strcmp(args[cur_arg], "ca-ignore-err") == 0)
ignerr = conf->ca_ignerr_bitfield;
@ -853,6 +844,14 @@ static int bind_parse_ignore_err(char **args, int cur_arg, struct proxy *px, str
return 0;
}
/* copy the string to be able to dump the complete one in case of
* error, because strtok_r is writing \0 inside. */
str = strdup(p);
if (!str) {
memprintf(err, "'%s' : Could not allocate memory", args[cur_arg]);
return ERR_ALERT | ERR_FATAL;
}
s1 = str;
while ((token = strtok_r(s1, ",", &s2))) {
s1 = NULL;