diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-11-08 18:15:39 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-11-08 18:15:39 +0100 |
| commit | c51cbe279921485e0ca19085d9e322c07508ced0 (patch) | |
| tree | 50a3387ddf6fb132e4629d1cd5e4ff6a9e63c022 /windows/driverlogic/src/driverlogic.cpp | |
| parent | 17d6905ea16c6bff5647ae698c1591bd32c563be (diff) | |
| parent | 1a4f9bd0afd96f815a9eaba725cbfcdb11b19f81 (diff) | |
| download | mullvadvpn-c51cbe279921485e0ca19085d9e322c07508ced0.tar.xz mullvadvpn-c51cbe279921485e0ca19085d9e322c07508ced0.zip | |
Merge branch 'win-ignore-misconfigured-adapters'
Diffstat (limited to 'windows/driverlogic/src/driverlogic.cpp')
| -rw-r--r-- | windows/driverlogic/src/driverlogic.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/windows/driverlogic/src/driverlogic.cpp b/windows/driverlogic/src/driverlogic.cpp index 713afbe9a6..7cd8cf5f51 100644 --- a/windows/driverlogic/src/driverlogic.cpp +++ b/windows/driverlogic/src/driverlogic.cpp @@ -186,9 +186,17 @@ ReturnCode CommandWintunDeleteAbandonedDevice(const std::vector<std::wstring> &a { static wchar_t WintunMullvadAdapter[] = L"{AFE43773-E1F8-4EBB-8536-576AB86AFE9A}"; - auto candidateAdapterGuid = GetDeviceNetCfgInstanceId(deviceInfoSet, deviceInfo); + try + { + auto candidateAdapterGuid = GetDeviceNetCfgInstanceId(deviceInfoSet, deviceInfo); - return 0 == _wcsicmp(candidateAdapterGuid.c_str(), WintunMullvadAdapter); + return 0 == _wcsicmp(candidateAdapterGuid.c_str(), WintunMullvadAdapter); + } + catch (...) + { + // Skip adapters for which we cannot obtain NetCfgInstanceId. + return false; + } }); EnumeratedDevice device; |