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

Resolves crash opportunities caused by unexpected libpcap version string format. Fixes #1112

Browse Source
This commit is contained in:
nnposter
2018-02-01 17:19:35 +00:00
parent ff62300249
commit 6889a2f6a5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,5 +1,8 @@
#Nmap Changelog ($Id$); -*-text-*- #Nmap Changelog ($Id$); -*-text-*-
o [GH#1112] Resolved crash opportunities caused by unexpected libpcap version
string format. [Gisle Vanem, nnposter]
o [NSE][GH#1083] New set of Telnet softmatches for version detection based on o [NSE][GH#1083] New set of Telnet softmatches for version detection based on
Telnet DO/DON'T options offered, covering a wide variety of devices and Telnet DO/DON'T options offered, covering a wide variety of devices and
operating systems. [D Roberson] operating systems. [D Roberson]

9
nmap.cc
View File

@@ -2749,11 +2749,10 @@ static void display_nmap_version() {
const char *pcap_version = pcap_lib_version(); const char *pcap_version = pcap_lib_version();
#ifdef WIN32 #ifdef WIN32
const char *pcap_num = strstr(pcap_version, "version "); const char *pcap_num = strpbrk(pcap_version, "0123456789");
if (pcap_num) { if (pcap_num == NULL)
pcap_num += strlen("version "); pcap_num = "(unknown)";
} std::string pcap_num_str (pcap_num, strcspn(pcap_num, ","));
std::string pcap_num_str (pcap_num, strchr(pcap_num, ',') - pcap_num);
#else #else
std::string pcap_num_str = get_word_or_quote(pcap_version, 2); std::string pcap_num_str = get_word_or_quote(pcap_version, 2);
#endif #endif