summaryrefslogtreecommitdiffhomepage
path: root/windows/driverlogic/src/driverlogic.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'windows/driverlogic/src/driverlogic.cpp')
-rw-r--r--windows/driverlogic/src/driverlogic.cpp12
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;