PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 14:11:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix segfault when using service name wildcards with -p.

Browse Source
This commit is contained in:
dmiller
2023-06-16 18:20:16 +00:00
parent c13ce4536e
commit 2da490f847
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
protocols.cc
View File

@@ -132,14 +132,14 @@ static int nmap_protocols_init() {
/* Now we make sure our protocols don't have duplicates */ /* Now we make sure our protocols don't have duplicates */
if (!status.second) { if (!status.second) {
if (o.debugging > 1) { if (o.debugging > 1) {
error("Protocol %d (%s) has duplicate number (%d) in protocols file %s", status.first->second.p_proto, ent.p_name, protno, filename); error("Protocol %hu (%s) has duplicate number (%hu) in protocols file %s", status.first->second.p_proto, ent.p_name, protno, filename);
} }
continue; continue;
} }
if (protocol_table[protno]) { if (protocol_table[protno]) {
if (o.debugging > 1) { if (o.debugging > 1) {
error("Protocol %d (%s) has duplicate name (%s) in protocols file %s", protno, protocol_table[protno]->p_name, ent.p_name, filename); error("Protocol %hu (%s) has duplicate name (%s) in protocols file %s", protno, protocol_table[protno]->p_name, ent.p_name, filename);
} }
continue; continue;
} }

2
protocols.h
View File

@@ -71,7 +71,7 @@
struct nprotoent { struct nprotoent {
const char *p_name; const char *p_name;
short p_proto; u16 p_proto;
}; };
int addprotocolsfromservmask(char *mask, u8 *porttbl); int addprotocolsfromservmask(char *mask, u8 *porttbl);

2
services.h
View File

@@ -69,7 +69,7 @@
struct nservent { struct nservent {
const char *s_name; const char *s_name;
const char *s_proto; const char *s_proto;
short s_port; u16 s_port;
}; };
int addportsfromservmask(const char *mask, u8 *porttbl, int range_type); int addportsfromservmask(const char *mask, u8 *porttbl, int range_type);