tnetwork: handle unparseable server-str - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit bf223470ce607a762700f144a6a0f4cb0205cf54
DIR parent 56a9ccca6df0c992b845ea363a6696c2efbcabb7
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sat, 25 Apr 2020 06:53:25 +0200
network: handle unparseable server-str
follow-up 9e57ae630ba96e6d2c40288d2633aeca8d20764d
fixes #6113
Diffstat:
M electrum/gui/kivy/main_window.py | 1 +
M electrum/gui/qt/network_dialog.py | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
---
DIR diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py
t@@ -150,6 +150,7 @@ class ElectrumWindow(App):
net_params = self.network.get_parameters()
try:
server = ServerAddr.from_str_with_inference(server_str)
+ if not server: raise Exception("failed to parse")
except Exception as e:
self.show_error(_("Invalid server details: {}").format(repr(e)))
return
DIR diff --git a/electrum/gui/qt/network_dialog.py b/electrum/gui/qt/network_dialog.py
t@@ -428,6 +428,7 @@ class NetworkChoiceLayout(object):
net_params = self.network.get_parameters()
try:
server = ServerAddr.from_str_with_inference(str(self.server_e.text()))
+ if not server: raise Exception("failed to parse")
except Exception:
return
net_params = net_params._replace(server=server,