ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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
{
uint32 ip = Acore::Net::address_to_uint(Acore::Net::make_address_v4(ipAddress));
auto itr = std::upper_bound(_ipLocationStore.begin(), _ipLocationStore.end(), ip, [](uint32 ip, IpLocationRecord const& loc) { return ip < loc.IpTo; });
if (itr == _ipLocationStore.end())
uint32 ip;
try
{
ip = Acore::Net::address_to_uint(Acore::Net::make_address_v4(ipAddress));
}
catch (boost::system::system_error const&)
{
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 &(*itr);
}