CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-10-21 11:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace last instances of strcpy

Browse source
This commit is contained in:
dmiller 2026-07-15 23:35:14 +00:00
parent 4233de2df1
commit acfcd139e0
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ncat/ncat_connect.c
View file

@ -553,11 +553,12 @@ static int do_proxy_socks4(void)
{
char socksbuf[8];
struct socks4_data socks4msg;
size_t datalen;
size_t datalen, remaining;
char *username = o.proxy_auth != NULL ? o.proxy_auth : "";
union sockaddr_u addr;
size_t sslen;
int sd;
int tmp = 0;
if (getaddrfamily(o.target) == 2) {
loguser("Error: IPv6 addresses are not supported with Socks4.\n");
@ -581,13 +582,15 @@ static int do_proxy_socks4(void)
socks4msg.type = SOCKS_CONNECT;
socks4msg.port = htons(o.portno);
if (strlen(username) >= sizeof(socks4msg.data)) {
remaining = sizeof(socks4msg.data);
tmp = Snprintf(socks4msg.data, remaining, "%s", username);
if (tmp >= remaining) {
loguser("Error: username is too long.\n");
close(sd);
return -1;
}
strcpy(socks4msg.data, username);
datalen = strlen(username) + 1;
datalen = tmp + 1;
remaining -= tmp + 1;
if (proxyresolve(o.target, 0, &addr.storage, &sslen, AF_INET)) {
/* target resolution has failed, possibly because it is disabled */
@ -599,13 +602,14 @@ static int do_proxy_socks4(void)
if (o.verbose)
loguser("Host %s will be resolved by the proxy.\n", o.target);
socks4msg.address = inet_addr("0.0.0.1");
if (datalen + strlen(o.target) >= sizeof(socks4msg.data)) {
tmp = Snprintf(socks4msg.data + datalen, remaining, "%s", o.target);
if (tmp >= remaining) {
loguser("Error: host name is too long.\n");
close(sd);
return -1;
}
strcpy(socks4msg.data + datalen, o.target);
datalen += strlen(o.target) + 1;
datalen += tmp + 1;
remaining -= tmp + 1;
} else {
/* addr is now populated with sockaddr_in */
socks4msg.address = addr.in.sin_addr.s_addr;

2
output.cc
View file

@ -716,7 +716,7 @@ void printportoutput(const Target *currenths, const PortList *plist) {
log_write(LOG_MACHINE, ", ");
else
first = 0;
strcpy(protocol, IPPROTO2STR(current->proto));
Strncpy(protocol, IPPROTO2STR(current->proto), sizeof(protocol));
Snprintf(portinfo, sizeof(portinfo), "%d/%s", current->portno, protocol);
state = statenum2str(current->state);
plist->getServiceDeductions(current->portno, current->proto, &sd);

8
services.cc
View file

@ -133,11 +133,13 @@ static int nmap_services_init() {
#ifndef WIN32
bufset(filename, "/etc/services");
#else
int len = GetSystemDirectory(filename, 480); // be safe
if(!len)
#define SERVICES_FILENAME_WIN "\\drivers\\etc\\services"
UINT remaining = sizeof(filename) - sizeof(SERVICES_FILENAME_WIN);
UINT len = GetSystemDirectory(filename, remaining);
if(!len || len > remaining)
fatal("GetSystemDirectory failed (%d) @#!#@", GetLastError());
else
strcpy(filename + len, "\\drivers\\etc\\services");
Snprintf(filename + len, sizeof(filename) - len, "%s", SERVICES_FILENAME_WIN);
#endif
}