From: Thomas Winter <Thomas.Winter@alliedtelesis.co.nz>
Date: Mon, 15 May 2023 02:18:47 +0000 (+1200)
Subject: iprep: fix parsing ip-rep data with carriage return
X-Git-Tag: suricata-7.0.1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9426%2Fhead;p=thirdparty%2Fsuricata.git

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.
---

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;