mirror of
https://github.com/nmap/nmap.git
synced 2025-12-07 13:11:28 +00:00
Avoid crashing if we can't write to zenmap.conf. Fixes #449
This commit is contained in:
@@ -124,6 +124,7 @@ import gtk
|
|||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
from os.path import split, isfile, join, abspath, exists
|
from os.path import split, isfile, join, abspath, exists
|
||||||
|
import errno
|
||||||
|
|
||||||
# Prevent loading PyXML
|
# Prevent loading PyXML
|
||||||
import xml
|
import xml
|
||||||
@@ -905,9 +906,23 @@ This scan has not been run yet. Start the scan with the "Scan" button first.'))
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
window = WindowConfig()
|
window = WindowConfig()
|
||||||
|
try:
|
||||||
window.x, window.y = self.get_position()
|
window.x, window.y = self.get_position()
|
||||||
window.width, window.height = self.get_size()
|
window.width, window.height = self.get_size()
|
||||||
window.save_changes()
|
window.save_changes()
|
||||||
|
except IOError as e:
|
||||||
|
if e.errno == errno.EACCES:
|
||||||
|
alert = HIGAlertDialog(
|
||||||
|
message_format=_("Can't save Zenmap configuration"),
|
||||||
|
# newline before path to help avoid weird line wrapping
|
||||||
|
secondary_text=_(
|
||||||
|
'Permission denied when writing to\n%s'
|
||||||
|
'\nMake sure the file exists and is writable.'
|
||||||
|
) % (Path.user_config_file))
|
||||||
|
alert.run()
|
||||||
|
alert.destroy()
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
|
||||||
self.destroy()
|
self.destroy()
|
||||||
|
|
||||||
|
|||||||
@@ -126,6 +126,7 @@ import gtk
|
|||||||
import gtk.gdk
|
import gtk.gdk
|
||||||
import pango
|
import pango
|
||||||
import re
|
import re
|
||||||
|
import errno
|
||||||
|
|
||||||
import zenmapCore.I18N
|
import zenmapCore.I18N
|
||||||
from zenmapCore.UmitLogging import log
|
from zenmapCore.UmitLogging import log
|
||||||
@@ -263,7 +264,20 @@ class NmapOutputViewer (gtk.VBox):
|
|||||||
self.nmap_highlight.__setattr__(widget.property_name, wid_props)
|
self.nmap_highlight.__setattr__(widget.property_name, wid_props)
|
||||||
|
|
||||||
nmap_out_prop.destroy()
|
nmap_out_prop.destroy()
|
||||||
|
try:
|
||||||
self.nmap_highlight.save_changes()
|
self.nmap_highlight.save_changes()
|
||||||
|
except IOError as e:
|
||||||
|
if e.errno == errno.EACCES:
|
||||||
|
alert = HIGAlertDialog(
|
||||||
|
message_format=_("Can't save Zenmap configuration"),
|
||||||
|
secondary_text=_(
|
||||||
|
'Permission denied when writing to \n%s'
|
||||||
|
'\nMake sure the file exists and is writable.'
|
||||||
|
) % (Path.user_config_file))
|
||||||
|
alert.run()
|
||||||
|
alert.destroy()
|
||||||
|
else:
|
||||||
|
raise
|
||||||
self.apply_highlighting()
|
self.apply_highlighting()
|
||||||
|
|
||||||
def apply_highlighting(self, start_iter=None, end_iter=None):
|
def apply_highlighting(self, start_iter=None, end_iter=None):
|
||||||
|
|||||||
Reference in New Issue
Block a user