CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 08:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #2854: crash if Ndiff exits with error status

Browse source
This commit is contained in:
dmiller 2024-05-28 19:30:06 +00:00
parent 453f9a7e25
commit b6e67f834c
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zenmap/zenmapCore/Diff.py
View file

@ -133,7 +133,7 @@ class NdiffCommand(subprocess.Popen):
command_list,
universal_newlines=True,
stdout=self.stdout_file,
stderr=self.stdout_file,
stderr=subprocess.PIPE,
env=env,
shell=(sys.platform == "win32")
)

7
zenmap/zenmapGUI/DiffCompare.py
View file

@ -377,9 +377,10 @@ class DiffWindow(Gtk.Window):
error_text = _(
"The ndiff process terminated with status code %d."
) % status
stderr = self.ndiff_process.stderr.read()
if len(stderr) > 0:
error_text += "\n\n" + stderr
if self.ndiff_process.stderr:
stderr = self.ndiff_process.stderr.read()
if len(stderr) > 0:
error_text += "\n\n" + stderr
alert = HIGAlertDialog(
message_format=_("Error running ndiff"),
secondary_text=error_text)