diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-03-27 12:23:00 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-03-27 12:23:00 -0700 |
| commit | 7d4a93fab3f4bfbb19e0f1ff1feeeadde649b116 (patch) | |
| tree | 447f4bd3ab35b0dc19db9397f5b766a26ef2dbdb /src | |
| parent | Merge pull request #6284 (diff) | |
| parent | net: fix incorrect less operator for top/i2p addresses (diff) | |
| download | monero-7d4a93fab3f4bfbb19e0f1ff1feeeadde649b116.tar.xz | |
Merge pull request #6285
d0641b42 net: fix incorrect less operator for top/i2p addresses (Aaron Hook)
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/i2p_address.cpp | 3 | ||||
| -rw-r--r-- | src/net/tor_address.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/net/i2p_address.cpp b/src/net/i2p_address.cpp index cba829d3f..f4cc75fee 100644 --- a/src/net/i2p_address.cpp +++ b/src/net/i2p_address.cpp @@ -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 diff --git a/src/net/tor_address.cpp b/src/net/tor_address.cpp index 904a9a0fc..4414861e7 100644 --- a/src/net/tor_address.cpp +++ b/src/net/tor_address.cpp @@ -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 |