danog/patches
1
0
Fork 0
mirror of https://github.com/danog/patches.git synced 2024-11-30 04:19:34 +01:00
Code Issues Projects Releases Wiki Activity

Patch possible bug in webrtc comparator.

Browse Source 
Found by MSVC debug iterators.

It could be true for both (conn1, conn2) and (conn2, conn1).
This commit is contained in:
John Preston 2020-07-31 18:35:09 +04:00
parent 27a6d855e4
commit c6d695c01c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc_src.diff
View File

@ -282,6 +282,19 @@ index ae49deb264..af192415f7 100644
testonly = true
visibility = [ "*" ]
sources = [ "base/fake_port_allocator.h" ]
diff --git a/p2p/base/basic_ice_controller.cc b/p2p/base/basic_ice_controller.cc
index aa20025b2c..506bf5cc9b 100644
--- a/p2p/base/basic_ice_controller.cc
+++ b/p2p/base/basic_ice_controller.cc
@@ -195,7 +195,7 @@ const Connection* BasicIceController::FindNextPingableConnection() {
if (conn1 == conn2) {
return false;
}
- return MorePingable(conn1, conn2) == conn2;
+ return MorePingable(std::min(conn1, conn2), std::max(conn1, conn2)) == conn2;
});
if (iter != pingable_connections.end()) {
return *iter;
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index d078482d96..a1bb711199 100644
--- a/rtc_base/BUILD.gn