CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-03 22:29:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid handling BaseException, so SysExit and KeyboardInterrupt are propagated. #1834

Browse source
This commit is contained in:
dmiller 2019-12-30 06:46:36 +00:00
parent 74708c3e3a
commit d75e255113
17 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zenmap/zenmapGUI/ScanInterface.py
View file

@ -618,8 +618,8 @@ class ScanInterface(HIGVBox):
alive = scan.scan_state()
if alive:
continue
except:
log.debug("Scan terminated unexpectedly: %s" % scan.command)
except Exception as e:
log.debug("Scan terminated unexpectedly: %s (%s)" % (scan.command, e))
self.scans_store.fail_running_scan(scan)
else:
log.debug("Scan finished: %s" % scan.command)
@ -650,7 +650,7 @@ class ScanInterface(HIGVBox):
# Some options like --iflist cause Nmap to emit an empty XML
# file. Ignore the exception in this case.
st = os.stat(command.get_xml_output_filename())
except:
except Exception:
st = None
if st is None or st.st_size > 0:
warn_dialog = HIGAlertDialog(