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

Fix a NULL pointer dereference in libdnet-stripped

Browse Source 
Reported and diagnosed by Gisle Vanem.

Fixes #70
This commit is contained in:
dmiller
2015-03-05 22:09:49 +00:00
parent e8f34f61a3
commit ee1156eb51
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libdnet-stripped/NMAP_MODIFICATIONS
View File

@@ -2032,3 +2032,21 @@ index 22c2d59..22c1e6a 100644
intf_close(intf);
return (-1);
}
o Fix a crash on Windows 8.1 with certain down interfaces:
http://seclists.org/nmap-dev/2015/q1/282
diff --git a/libdnet-stripped/src/intf-win32.c b/libdnet-stripped/src/intf-win32.c
index 22c1e6a..3c09f9c 100644
--- a/libdnet-stripped/src/intf-win32.c
+++ b/libdnet-stripped/src/intf-win32.c
@@ -262,7 +262,8 @@ _find_adapter_address(intf_t *intf, const char *device)
n = atoi(p);
for (a = intf->iftable; a != NULL; a = a->Next) {
- if (intf->ifcombo[type].idx[n].ipv4 == a->IfIndex &&
+ if ( intf->ifcombo[type].idx != NULL &&
+ intf->ifcombo[type].idx[n].ipv4 == a->IfIndex &&
intf->ifcombo[type].idx[n].ipv6 == a->Ipv6IfIndex) {
return a;
}

3
libdnet-stripped/src/intf-win32.c
View File

@@ -262,7 +262,8 @@ _find_adapter_address(intf_t *intf, const char *device)
n = atoi(p);
for (a = intf->iftable; a != NULL; a = a->Next) {
if (intf->ifcombo[type].idx[n].ipv4 == a->IfIndex &&
if ( intf->ifcombo[type].idx != NULL &&
intf->ifcombo[type].idx[n].ipv4 == a->IfIndex &&
intf->ifcombo[type].idx[n].ipv6 == a->Ipv6IfIndex) {
return a;
}