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

Fix a crash in Zenmap Compare Results.

Browse Source
This commit is contained in:
dmiller
2015-09-23 20:23:00 +00:00
parent 6c934abb93
commit 15eb10e9fb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o Fix a crash in Zenmap when using Compare Results:
AttributeError: 'NoneType' object has no attribute 'get_nmap_output'
[Daniel Miller]
o [NSE] Fix http.get_url function when used with https scheme. Previously, o [NSE] Fix http.get_url function when used with https scheme. Previously,
plaintext http to port 443 was attempted first. [jah] plaintext http to port 443 was attempted first. [jah]

5
zenmap/zenmapGUI/DiffCompare.py
View File

@@ -302,7 +302,10 @@ class ScanChooser(HIGVBox):
def get_nmap_output(self): def get_nmap_output(self):
"""Return the currently selected scan's output as a string, or None if """Return the currently selected scan's output as a string, or None if
no valid scan is selected.""" no valid scan is selected."""
return self.parsed_scan.get_nmap_output() if self.parsed_scan is not None:
return self.parsed_scan.get_nmap_output()
else:
return None
nmap_output = property(get_nmap_output) nmap_output = property(get_nmap_output)
parsed_scan = property(get_parsed_scan) parsed_scan = property(get_parsed_scan)