azerothcore/azerothcore-wotlk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(Core/IPLocation): Prevent crash when parsing invalid IP (#25095)

Browse Source
This commit is contained in:
Kevin Gross
2026-03-16 08:24:14 -03:00
committed by GitHub
parent b872409411
commit c947a51ecb
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/IPLocation/IPLocation.cpp
View File

@@ -107,17 +107,24 @@ void IpLocationStore::Load()
IpLocationRecord const* IpLocationStore::GetLocationRecord(std::string const& ipAddress) const IpLocationRecord const* IpLocationStore::GetLocationRecord(std::string const& ipAddress) const
{ {
uint32 ip = Acore::Net::address_to_uint(Acore::Net::make_address_v4(ipAddress)); uint32 ip;
auto itr = std::upper_bound(_ipLocationStore.begin(), _ipLocationStore.end(), ip, [](uint32 ip, IpLocationRecord const& loc) { return ip < loc.IpTo; });
if (itr == _ipLocationStore.end()) try
{
ip = Acore::Net::address_to_uint(Acore::Net::make_address_v4(ipAddress));
}
catch (boost::system::system_error const&)
{ {
return nullptr; return nullptr;
} }
if (ip < itr->IpFrom) auto itr = std::upper_bound(_ipLocationStore.begin(), _ipLocationStore.end(), ip, [](uint32 ip, IpLocationRecord const& loc) { return ip < loc.IpTo; });
{
if (itr == _ipLocationStore.end())
return nullptr;
if (ip < itr->IpFrom)
return nullptr; return nullptr;
}
return &(*itr); return &(*itr);
} }