ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 19:19:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix OOB error in sa2cidr()

Browse Source
This commit is contained in:
Daniel Vassdal 2013-11-24 16:46:04 -08:00 committed by Attila Molnar
parent 69a2d4e9b2
commit 84dc48d142
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/socket.cpp
View File

@ -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;
}
}