hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed memory leak in Socket::isLocal()

Browse source
This commit is contained in:
Thulinma 2020-02-24 16:29:01 +01:00
parent 9743f405a3
commit 95847ffb5b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/socket.cpp
View file

@ -68,6 +68,7 @@ bool Socket::isLocal(const std::string &remotehost){
struct ifaddrs *ifAddrStruct = NULL;
struct ifaddrs *ifa = NULL;
void *tmpAddrPtr = NULL;
bool ret = false;
char addressBuffer[INET6_ADDRSTRLEN];
getifaddrs(&ifAddrStruct);
@ -78,18 +79,18 @@ bool Socket::isLocal(const std::string &remotehost){
tmpAddrPtr = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
INSANE_MSG("Comparing '%s' to '%s'", remotehost.c_str(), addressBuffer);
if (remotehost == addressBuffer){return true;}
if (remotehost == addressBuffer){ret = true; break;}
INSANE_MSG("Comparing '%s' to '::ffff:%s'", remotehost.c_str(), addressBuffer);
if (remotehost == std::string("::ffff:") + addressBuffer){return true;}
if (remotehost == std::string("::ffff:") + addressBuffer){ret = true; break;}
}else if (ifa->ifa_addr->sa_family == AF_INET6){// check it is IP6
tmpAddrPtr = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
INSANE_MSG("Comparing '%s' to '%s'", remotehost.c_str(), addressBuffer);
if (remotehost == addressBuffer){return true;}
if (remotehost == addressBuffer){ret = true; break;}
}
}
if (ifAddrStruct != NULL) freeifaddrs(ifAddrStruct);
return false;
return ret;
}
/// Helper function that matches two binary-format IPv6 addresses with prefix bits of prefix.