ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-12 05:23:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix segfault on unique interface name list generation (for multipath)

Browse Source
This commit is contained in:
Joseph Henry 2020-07-14 17:05:05 -07:00
parent 29e7fa5c4b
commit decd5add2a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osdep/Binder.hpp
View File

@ -348,10 +348,11 @@ public:
} }
// Generate set of unique interface names (used for formation of logical link set in multipath code) // Generate set of unique interface names (used for formation of logical link set in multipath code)
// TODO: Could be gated not to run if multipath is not enabled.
for(std::map<InetAddress,std::string>::const_iterator ii(localIfAddrs.begin());ii!=localIfAddrs.end();++ii) { for(std::map<InetAddress,std::string>::const_iterator ii(localIfAddrs.begin());ii!=localIfAddrs.end();++ii) {
linkIfNames.insert(ii->second); linkIfNames.insert(ii->second);
} }
for (std::set<std::string>::iterator si(linkIfNames.begin());si!=linkIfNames.end();si++) { for (std::set<std::string>::iterator si(linkIfNames.begin());si!=linkIfNames.end();) {
bool bFoundMatch = false; bool bFoundMatch = false;
for(std::map<InetAddress,std::string>::const_iterator ii(localIfAddrs.begin());ii!=localIfAddrs.end();++ii) { for(std::map<InetAddress,std::string>::const_iterator ii(localIfAddrs.begin());ii!=localIfAddrs.end();++ii) {
if (ii->second == *si) { if (ii->second == *si) {
@ -360,7 +361,10 @@ public:
} }
} }
if (!bFoundMatch) { if (!bFoundMatch) {
linkIfNames.erase(si); linkIfNames.erase(si++);
}
else {
++si;
} }
} }