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

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

4
zenmap/zenmapCore/NmapCommand.py
View file

@ -274,14 +274,14 @@ class NmapCommand(object):
log.debug(">>> SIGTERM has not worked even after waiting for 5 seconds. Using SIGKILL.") # noqa
os.kill(self.command_process.pid, SIGKILL)
self.command_process.wait()
except:
except Exception:
pass
else:
try:
import ctypes
ctypes.windll.kernel32.TerminateProcess(
int(self.command_process._handle), -1)
except:
except Exception:
pass
def get_path(self):