X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcidr.cpp;h=3776114372b2d5361ecfc9cdf4a91b1536aa3bfb;hb=2d35c3396a1f00375d45b874dafb9e0bdb520a9b;hp=8d199353db58d069a9e48ab628e5e6f21db756d7;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cidr.cpp b/src/cidr.cpp
index 8d199353d..377611437 100644
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -53,8 +53,8 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
 		}
 		else
 		{
-			address_copy = address.substr(username_addr_pos + 1);
-			cidr_copy = cidr_mask.substr(username_mask_pos + 1);
+			address_copy.assign(address, username_addr_pos + 1, std::string::npos);
+			cidr_copy.assign(cidr_mask, username_mask_pos + 1, std::string::npos);
 		}
 	}
 	else
@@ -73,7 +73,11 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
 	}
 
 	irc::sockets::sockaddrs addr;
-	irc::sockets::aptosa(address_copy, 0, addr);
+	if (!irc::sockets::aptosa(address_copy, 0, addr))
+	{
+		// The address could not be parsed.
+		return false;
+	}
 
 	irc::sockets::cidr_mask mask(cidr_copy);
 	irc::sockets::cidr_mask mask2(addr, mask.length);