From a284f01c1ddc39e9710f9992322bafda6d3e9f1d Mon Sep 17 00:00:00 2001 From: Thomas Winter Date: Mon, 15 May 2023 14:18:47 +1200 Subject: [PATCH] iprep: fix parsing ip-rep data with carriage return Commit e7c0f0ad91fd removed uses of atoi with a new number parsing functions. This broke parsing ip-reputation data files that contained trailing carriage returns as it was being included in the number string to convert. Bug: #6243. --- src/reputation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/reputation.c b/src/reputation.c index b9f2186d01..75f3ba0c3f 100644 --- a/src/reputation.c +++ b/src/reputation.c @@ -282,7 +282,8 @@ static int SRepSplitLine(SRepCIDRTree *cidr_ctx, char *line, Address *ip, uint8_ char *origline = line; while (i < (int)line_len) { - if (line[i] == ',' || line[i] == '\n' || line[i] == '\0' || i == (int)(line_len - 1)) { + if (line[i] == ',' || line[i] == '\n' || line[i] == '\r' || line[i] == '\0' || + i == (int)(line_len - 1)) { line[i] = '\0'; ptrs[idx] = line; -- 2.47.2