rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't crash if URLs are invalid in commands

Browse Source
This commit is contained in:
Florian Bruhin 2014-06-23 14:26:04 +02:00
parent e5e466f6d1
commit dc91bcdf91
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/browser/commands.py
View File

@ -39,7 +39,7 @@ import qutebrowser.utils.log as log
import qutebrowser.utils.url as urlutils import qutebrowser.utils.url as urlutils
from qutebrowser.utils.misc import shell_escape from qutebrowser.utils.misc import shell_escape
from qutebrowser.utils.qt import (check_overflow, check_print_compat, from qutebrowser.utils.qt import (check_overflow, check_print_compat,
qt_ensure_valid) qt_ensure_valid, QtValueError)
from qutebrowser.utils.editor import ExternalEditor from qutebrowser.utils.editor import ExternalEditor
from qutebrowser.commands.exceptions import CommandError from qutebrowser.commands.exceptions import CommandError
from qutebrowser.commands.userscripts import UserscriptRunner from qutebrowser.commands.userscripts import UserscriptRunner
@ -74,7 +74,14 @@ class CommandDispatcher:
def _current_url(self): def _current_url(self):
"""Get the URL of the current tab.""" """Get the URL of the current tab."""
url = self._tabs.currentWidget().url() url = self._tabs.currentWidget().url()
try:
qt_ensure_valid(url) qt_ensure_valid(url)
except QtValueError as e:
msg = "Current URL is invalid"
if e.reason:
msg += " ({})".format(e.reason)
msg += "!"
raise CommandError(msg)
return url return url
def _scroll_percent(self, perc=None, count=None, orientation=None): def _scroll_percent(self, perc=None, count=None, orientation=None):