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

BUG/MINOR: ssl/crt-list: crt-list could end without a \n

Browse Source 
Since the refactoring of the crt-list, the same function is used to
parse a crt-list file and a crt-list line on the CLI.

The assumption that a line on the CLI and a line in a file is finished
by a \n was made. However that is potentialy not the case with a file
which does not finish by a \n.

This patch fixes issue #860 and must be backported in 2.2.
This commit is contained in:
William Lallemand 2020-09-16 11:55:09 +02:00
parent a459826056
commit 0354b658f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl_crtlist.c
View File

@ -380,8 +380,8 @@ int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct proxy *cu
cfgerr |= ERR_ALERT | ERR_FATAL;
goto error;
}
*(end - 1) = '\0'; /* line parser mustn't receive any \n */
if (*(end - 1) == '\n')
*(end - 1) = '\0'; /* line parser mustn't receive any \n */
cfgerr |= crtlist_parse_line(thisline, &crt_path, entry, file, linenum, err);
if (cfgerr)
goto error;