From bd260744ecde49adbda20b62a116cf8508984c64 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 18 Nov 2022 18:59:30 +0000 Subject: Fix matching partially expanded IPv6 addresses. --- src/cidr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cidr.cpp') diff --git a/src/cidr.cpp b/src/cidr.cpp index f45c63b98..ce5984c40 100644 --- a/src/cidr.cpp +++ b/src/cidr.cpp @@ -68,9 +68,9 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr } const std::string::size_type per_pos = cidr_copy.rfind('/'); - if ((per_pos == std::string::npos) || (per_pos == cidr_copy.length()-1) + if ((per_pos != std::string::npos) && ((per_pos == cidr_copy.length()-1) || (cidr_copy.find_first_not_of("0123456789", per_pos+1) != std::string::npos) - || (cidr_copy.find_first_not_of("0123456789abcdefABCDEF.:") < per_pos)) + || (cidr_copy.find_first_not_of("0123456789abcdefABCDEF.:") < per_pos))) { // The CIDR mask is invalid return false; -- cgit v1.3.1-10-gc9f91