PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-09 07:59:03 +00:00
Code Issues Projects Releases Wiki Activity

Avoid crashing --version when Npcap can't be loaded (missing)

Browse Source
This commit is contained in:
dmiller
2019-04-08 14:58:54 +00:00
parent d8c2a275cf
commit 8962c827e1
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nmap.cc
View File

@@ -2753,20 +2753,24 @@ static void display_nmap_version() {
with.push_back(std::string("libpcre-") + get_word_or_quote(pcre_version(), 0));
#endif
const char *pcap_version = pcap_lib_version();
#ifdef WIN32
const char *pcap_num = strpbrk(pcap_version, "0123456789");
if (pcap_num == NULL)
pcap_num = "(unknown)";
std::string pcap_num_str (pcap_num, strcspn(pcap_num, ","));
if (o.have_pcap) {
const char *pcap_version = pcap_lib_version();
const char *pcap_num = strpbrk(pcap_version, "0123456789");
if (pcap_num == NULL)
pcap_num = "(unknown)";
std::string pcap_num_str (pcap_num, strcspn(pcap_num, ","));
with.push_back(get_word_or_quote(pcap_version, 0) + std::string("-") + pcap_num_str);
}
#else
const char *pcap_version = pcap_lib_version();
std::string pcap_num_str = get_word_or_quote(pcap_version, 2);
#endif
with.push_back(
#ifdef PCAP_INCLUDED
std::string("nmap-") +
#endif
get_word_or_quote(pcap_version, 0) + std::string("-") + pcap_num_str);
#endif
#ifdef DNET_INCLUDED
with.push_back(std::string("nmap-libdnet-") + DNET_VERSION);