Merge insp20

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

diff --git a/src/cidr.cpp b/src/cidr.cpp
index 050a3549da281111ea4ada286058db1f09268032..250ad9c69b0d716dc6cee3b2758fec1bede6b6e7 100644 (file)
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -19,8 +19,6 @@
  */
 
 
-/* $Core */
-
 #include "inspircd.h"
 
 /* Match CIDR strings, e.g. 127.0.0.1 to 127.0.0.0/8 or 3ffe:1:5:6::8 to 3ffe:1::0/32
@@ -55,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
@@ -65,8 +63,14 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
                cidr_copy.assign(cidr_mask);
        }
 
-       if (cidr_copy.find('/') == std::string::npos)
+       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("0123456789abcdefABCDEF.:") < per_pos))
+       {
+               // The CIDR mask is invalid
                return false;
+       }
 
        irc::sockets::sockaddrs addr;
        irc::sockets::aptosa(address_copy, 0, addr);
@@ -76,5 +80,3 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
 
        return mask == mask2;
 }
-
-