upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-16 17:18:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

BUG/MEDIUM: map: The map parser includes blank lines.

Browse source 
The parser check the end line comparing to the null character.
In fact, the end of line can be also '\r' or '\n'.

The effect is that empty lines are loaded and indexed in maps.

The bug was introduced by commit d5f624dd ("MEDIUM: sample:
add the "map" converter") in 1.5-dev20. No backport is needed.
This commit is contained in:
Thierry FOURNIER 2014-02-26 18:30:13 +01:00 committed by Willy Tarreau
parent 4a4e6bca60
commit 338a031e29
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/map.c
View file

@ -248,7 +248,7 @@ static int map_read_entries_from_file(const char *filename,
c++;
/* empty lines are ignored too */
if (*c == '\0')
if (*c == '\0' || *c == '\r' || *c == '\n')
continue;
/* look for the end of the key */