m_chanfilter: Apply filters to part messages (#1702)

[user/henk/code/inspircd.git] / src / cidr.cpp

diff --git a/src/cidr.cpp b/src/cidr.cpp
index 875b953044498ece026e15423b4c102cbd813c60..3776114372b2d5361ecfc9cdf4a91b1536aa3bfb 100644 (file)
--- 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
@@ -66,14 +66,18 @@ 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)
                || (cidr_copy.find_first_not_of("0123456789", per_pos+1) != std::string::npos)
-               || (cidr_copy.find_first_not_of("0123456789abcdef.:") < per_pos))
+               || (cidr_copy.find_first_not_of("0123456789abcdefABCDEF.:") < per_pos))
        {
                // The CIDR mask is invalid
                return false;
        }
 
        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);