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

fix for -p used with bad ranges in ip proto scan -- from Kris Katterjohn

Browse source
This commit is contained in:
fyodor 2007-01-01 00:00:05 +00:00
parent 12e25f4879
commit 9879720d45
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
nmap.cc
View file

@ -1902,8 +1902,12 @@ struct scan_lists *getpts(char *origexpr) {
}
else if (isdigit((int) *current_range)) {
rangestart = strtol(current_range, &endptr, 10);
if (rangestart < 0 || rangestart > 65535) {
fatal("Ports to be scanned must be between 0 and 65535 inclusive");
if (o.ipprotscan) {
if (rangestart < 0 || rangestart > 255)
fatal("Protocols to be scanned must be between 0 and 255 inclusive");
} else {
if (rangestart < 0 || rangestart > 65535)
fatal("Ports to be scanned must be between 0 and 65535 inclusive");
}
/* if (rangestart == 0) {
error("WARNING: Scanning \"port 0\" is supported, but unusual.");
@ -1924,8 +1928,12 @@ struct scan_lists *getpts(char *origexpr) {
rangeend = 65535;
} else if (isdigit((int) *current_range)) {
rangeend = strtol(current_range, &endptr, 10);
if (rangeend < 0 || rangeend > 65535) {
fatal("Ports to be scanned must be between 0 and 65535 inclusive");
if (o.ipprotscan) {
if (rangeend < 0 || rangeend > 255)
fatal("Protocols to be scanned must be between 0 and 255 inclusive");
} else {
if (rangeend < 0 || rangeend > 65535)
fatal("Ports to be scanned must be between 0 and 65535 inclusive");
}
current_range = endptr;
} else {
@ -1947,7 +1955,7 @@ struct scan_lists *getpts(char *origexpr) {
tcpportcount++;
if (range_type & SCAN_UDP_PORT)
udpportcount++;
if (range_type & SCAN_PROTOCOLS && rangestart < 256)
if (range_type & SCAN_PROTOCOLS)
protcount++;
porttbl[rangestart] |= range_type;
}