diff options
author | Attila Molnar <attilamolnar@hush.com> | 2014-03-10 12:17:41 +0100 |
---|---|---|
committer | Attila Molnar <attilamolnar@hush.com> | 2014-03-10 12:17:41 +0100 |
commit | 6aaf7047297b739377e7d509cb914f32447fb281 (patch) | |
tree | cac3da918cfc3b0e4931f195d0fd69aa59200844 | |
parent | ed08638c1afa2742f0ebc3006dd0f1054020f7d4 (diff) |
Improve detection for non-cidr masks to prevent unwanted matches
Fixes issue #762 reported by @neoinr
-rw-r--r-- | src/cidr.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/cidr.cpp b/src/cidr.cpp index 050a3549d..a4a252a48 100644 --- a/src/cidr.cpp +++ b/src/cidr.cpp @@ -65,8 +65,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("0123456789.:") < per_pos)) + { + // The CIDR mask is invalid return false; + } irc::sockets::sockaddrs addr; irc::sockets::aptosa(address_copy, 0, addr); |