RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: ssl: ssl_conf always set to NULL on crt-list parsing 

When reading a crt-list file, the SSL options betweeen square brackets
are parsed, however the calling function sets the ssl_conf ptr to NULL
leading to all options being ignored, and a memory leak.

This is a remaining of the previous code which was forgotten.

This bug was introduced by 97b0810 ("MINOR: ssl: split the line parsing
of the crt-list").
This commit is contained in:
William Lallemand 2020-04-10 17:13:09 +02:00 committed by William Lallemand
parent e718dfb4c2
commit 87a0db9993
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl_sock.c
View File

@ -4862,7 +4862,6 @@ static int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct pr
char *end;
char *line = thisline;
char *crt_path;
struct ssl_bind_conf *ssl_conf = NULL;
struct ckch_store *ckchs;
linenum++;
@ -4925,7 +4924,6 @@ static int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct pr
goto error;
entry->node.key = ckchs;
entry->ssl_conf = ssl_conf;
entry->crtlist = newlist;
ebpt_insert(&newlist->entries, &entry->node);
LIST_ADDQ(&newlist->ord_entries, &entry->by_crtlist);