generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 17:30:44 +02:00
Code Issues Projects Releases Wiki Activity

fixed GH #2863: NetworkInterface::map can fail to reveal some interfaces if an earlier one can not be handled

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-01-22 13:36:46 +01:00
parent 1cdc77ebc1
commit f1fcdffcb5
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Net/src/NetworkInterface.cpp
View File

@@ -1388,9 +1388,9 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
if (getifaddrs(&ifaces) < 0) if (getifaddrs(&ifaces) < 0)
throw NetException("cannot get network adapter list"); throw NetException("cannot get network adapter list");
try for (currIface = ifaces; currIface != 0; currIface = currIface->ifa_next)
{ {
for (currIface = ifaces; currIface != 0; currIface = currIface->ifa_next) try
{ {
if (!currIface->ifa_addr) continue; if (!currIface->ifa_addr) continue;
@@ -1462,9 +1462,14 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
} }
} }
} }
} catch (Poco::Exception&)
catch (...) {
{ }
catch (...)
{
if (ifaces) freeifaddrs(ifaces);
throw;
}
} }
if (ifaces) freeifaddrs(ifaces); if (ifaces) freeifaddrs(ifaces);
@@ -1601,9 +1606,9 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
if (getifaddrs(&ifaces) < 0) if (getifaddrs(&ifaces) < 0)
throw NetException("cannot get network adapter list"); throw NetException("cannot get network adapter list");
try for (iface = ifaces; iface; iface = iface->ifa_next)
{ {
for (iface = ifaces; iface; iface = iface->ifa_next) try
{ {
if (!iface->ifa_addr) continue; if (!iface->ifa_addr) continue;
@@ -1678,13 +1683,16 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
ifIt->second.addAddress(address, subnetMask, broadcastAddress); ifIt->second.addAddress(address, subnetMask, broadcastAddress);
} }
} }
} // for interface }
} catch (Poco::Exception&)
catch (...) {
{ }
if (ifaces) freeifaddrs(ifaces); catch (...)
throw; {
} if (ifaces) freeifaddrs(ifaces);
throw;
}
} // for interface
if (ifaces) freeifaddrs(ifaces); if (ifaces) freeifaddrs(ifaces);