diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-07-28 12:51:20 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-10-30 16:50:59 +0100 |
| commit | 295591046f2e575caf77ac050615078bb5aad12c (patch) | |
| tree | 943cb21eb0ab869a3a158136d1c67b9b49a8cdfa | |
| parent | api: make adapter name searching more efficient (diff) | |
| download | wintun-295591046f2e575caf77ac050615078bb5aad12c.tar.xz wintun-295591046f2e575caf77ac050615078bb5aad12c.zip | |
api: revise str/memcpy
Signed-off-by: Simon Rozman <simon@rozman.si>
| -rw-r--r-- | api/devmgmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/devmgmt.c b/api/devmgmt.c index 12862e8..90b7324 100644 --- a/api/devmgmt.c +++ b/api/devmgmt.c @@ -476,7 +476,7 @@ CreateAdapterData( goto cleanupAdapter; } - wcscpy_s((*Adapter)->Pool, _countof((*Adapter)->Pool), Pool); + wcsncpy_s((*Adapter)->Pool, _countof((*Adapter)->Pool), Pool, _TRUNCATE); Result = ERROR_SUCCESS; cleanupAdapter: @@ -689,7 +689,7 @@ WintunSetAdapterName(_In_ const WINTUN_ADAPTER *Adapter, _In_z_count_c_(MAX_ADAP DWORD Result; const int MaxSuffix = 1000; WCHAR AvailableName[MAX_ADAPTER_NAME]; - wcscpy_s(AvailableName, _countof(AvailableName), Name); + wcsncpy_s(AvailableName, _countof(AvailableName), Name, _TRUNCATE); for (int i = 0;; ++i) { Result = NciSetConnectionName(&Adapter->CfgInstanceID, AvailableName); @@ -755,7 +755,7 @@ WintunSetAdapterName(_In_ const WINTUN_ADAPTER *Adapter, _In_z_count_c_(MAX_ADAP void WINAPI WintunGetAdapterGUID(_In_ const WINTUN_ADAPTER *Adapter, _Out_ GUID *Guid) { - memcpy_s(Guid, sizeof(*Guid), &Adapter->CfgInstanceID, sizeof(Adapter->CfgInstanceID)); + memcpy(Guid, &Adapter->CfgInstanceID, sizeof(GUID)); } /** |