CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid strcat in init_npcap_dll_path()

Browse source
This commit is contained in:
dmiller 2026-07-17 21:56:25 +00:00
parent d21db40935
commit 4b28eed0f0
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mswin32/winfix.cc
View file

@ -188,19 +188,19 @@ static void init_npcap_dll_path()
{
BOOL(WINAPI *SetDllDirectory)(LPCTSTR);
char sysdir_name[512];
int len;
SetDllDirectory = (BOOL(WINAPI *)(LPCTSTR)) GetProcAddress(GetModuleHandle("kernel32.dll"), "SetDllDirectoryA");
if (SetDllDirectory == NULL) {
pfatal("Error in SetDllDirectory");
pfatal("Error in GetProcAddress");
}
else {
len = GetSystemDirectory(sysdir_name, 480); // be safe
if (!len)
pfatal("Error in GetSystemDirectory");
strcat(sysdir_name, "\\Npcap");
UINT remaining = sizeof(sysdir_name) - sizeof(NPCAP_SUBDIR);
UINT len = GetSystemDirectory(sysdir_name, remaining);
if (!len || len > remaining)
pfatal("Error in GetSystemDirectory (%d)", GetLastError());
Strncpy(sysdir_name + len, "\\Npcap", sizeof(sysdir_name) - len);
if (SetDllDirectory(sysdir_name) == 0)
pfatal("Error in SetDllDirectory(\"System32\\Npcap\")");
pfatal("Error in SetDllDirectory(\"%s\")", sysdir_name);
}
}

15
nping/winfix.cc
View file

@ -186,19 +186,20 @@ static void init_npcap_dll_path()
{
BOOL(WINAPI *SetDllDirectory)(LPCTSTR);
char sysdir_name[512];
int len;
SetDllDirectory = (BOOL(WINAPI *)(LPCTSTR)) GetProcAddress(GetModuleHandle("kernel32.dll"), "SetDllDirectoryA");
if (SetDllDirectory == NULL) {
pfatal("Error in SetDllDirectory");
pfatal("Error in GetProcAddress");
}
else {
len = GetSystemDirectory(sysdir_name, 480); // be safe
if (!len)
pfatal("Error in GetSystemDirectory (%d)", GetLastError());
strcat(sysdir_name, "\\Npcap");
#define NPCAP_SUBDIR "\\Npcap"
UINT remaining = sizeof(sysdir_name) - sizeof(NPCAP_SUBDIR);
UINT len = GetSystemDirectory(sysdir_name, remaining);
if (!len || len > remaining)
pfatal("Error in GetSystemDirectory");
Strncpy(sysdir_name + len, "\\Npcap", sizeof(sysdir_name) - len);
if (SetDllDirectory(sysdir_name) == 0)
pfatal("Error in SetDllDirectory(\"System32\\Npcap\")");
pfatal("Error in SetDllDirectory(\"%s\")", sysdir_name);
}
}