void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #1883 (#1886)

Browse source 
Still unknown as to why, but the call to `nc->GetProperties()` can fail
when setting a friendly name on the Windows virtual ethernet adapter.
Ensure that `ncp` is not null before continuing and accessing the device
GUID.
This commit is contained in:
Grant Limberg 2023-03-01 18:00:59 -08:00 • committed by GitHub
parent 936dda4773
commit 6cf3b65953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
osdep/WindowsEthernetTap.cpp
View file

@ -850,12 +850,14 @@ void WindowsEthernetTap::setFriendlyName(const char *dn)
NETCON_PROPERTIES *ncp = nullptr; NETCON_PROPERTIES *ncp = nullptr;
nc->GetProperties(&ncp); nc->GetProperties(&ncp);
GUID curId = ncp->guidId; if (ncp != nullptr) {
if (curId == _deviceGuid) { GUID curId = ncp->guidId;
wchar_t wtext[255]; if (curId == _deviceGuid) {
mbstowcs(wtext, dn, strlen(dn)+1); wchar_t wtext[255];
nc->Rename(wtext); mbstowcs(wtext, dn, strlen(dn)+1);
found = true; nc->Rename(wtext);
found = true;
}
} }
nc->Release(); nc->Release();
} }