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

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.

diff --git a/src/map.c b/src/map.c
index 28908c534f43477809135fcdda9078e93090a7a2..c3a13a7cb8a9f0fc6cb64ea39d89bb5be5b6db88 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -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 */