Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-02 19:06:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6285

Browse source 
d0641b42 net: fix incorrect less operator for top/i2p addresses (Aaron Hook)
This commit is contained in:
Alexander Blair 2020-03-27 12:23:00 -07:00
commit 7d4a93fab3
No known key found for this signature in database
GPG key ID: C64552D877C32479
3 changed files with 406 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/net/i2p_address.cpp
View file

@ -171,7 +171,8 @@ namespace net
bool i2p_address::less(const i2p_address& rhs) const noexcept
{
return std::strcmp(host_str(), rhs.host_str()) < 0 || port() < rhs.port();
int res = std::strcmp(host_str(), rhs.host_str());
return res < 0 || (res == 0 && port() < rhs.port());
}
bool i2p_address::is_same_host(const i2p_address& rhs) const noexcept

3
src/net/tor_address.cpp
View file

@ -173,7 +173,8 @@ namespace net
bool tor_address::less(const tor_address& rhs) const noexcept
{
return std::strcmp(host_str(), rhs.host_str()) < 0 || port() < rhs.port();
int res = std::strcmp(host_str(), rhs.host_str());
return res < 0 || (res == 0 && port() < rhs.port());
}
bool tor_address::is_same_host(const tor_address& rhs) const noexcept