summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vassdal <shutter@canternet.org>2013-11-24 16:46:04 -0800
committerAttila Molnar <attilamolnar@hush.com>2014-01-17 12:38:53 +0100
commit84dc48d1426212ed44f3df3fc88cc64cf0e0f610 (patch)
tree42bdefbf212d4b4fd4e4290bcc88147691c109d4
parent69a2d4e9b2c5f90dc8ed3e5efca357c25eedbf74 (diff)
Fix OOB error in sa2cidr()
-rw-r--r--src/socket.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/socket.cpp b/src/socket.cpp
index 6fc7b13f8..a695f8c73 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -264,35 +264,41 @@ bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) c
static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range)
{
const unsigned char* base;
+ unsigned char target_byte;
cidr.type = sa.sa.sa_family;
+
+ memset(cidr.bits, 0, sizeof(cidr.bits));
+
if (cidr.type == AF_INET)
{
+ target_byte = sizeof(sa.in4.sin_addr);
base = (unsigned char*)&sa.in4.sin_addr;
if (range > 32)
range = 32;
}
else if (cidr.type == AF_INET6)
{
+ target_byte = sizeof(sa.in6.sin6_addr);
base = (unsigned char*)&sa.in6.sin6_addr;
if (range > 128)
range = 128;
}
else
{
- base = (unsigned char*)"";
- range = 0;
+ cidr.length = 0;
+ return;
}
cidr.length = range;
unsigned int border = range / 8;
unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF;
- for(unsigned int i=0; i < 16; i++)
+ for(unsigned int i=0; i < target_byte; i++)
{
if (i < border)
cidr.bits[i] = base[i];
else if (i == border)
cidr.bits[i] = base[i] & bitmask;
else
- cidr.bits[i] = 0;
+ return;
}
}