ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-20 17:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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;
nc->GetProperties(&ncp);
GUID curId = ncp->guidId;
if (curId == _deviceGuid) {
wchar_t wtext[255];
mbstowcs(wtext, dn, strlen(dn)+1);
nc->Rename(wtext);
found = true;
if (ncp != nullptr) {
GUID curId = ncp->guidId;
if (curId == _deviceGuid) {
wchar_t wtext[255];
mbstowcs(wtext, dn, strlen(dn)+1);
nc->Rename(wtext);
found = true;
}
}
nc->Release();
}