AaronFiore/electrum
1
0
Fork 0
Code Activity

config: reject non-json-serialisable writes

Browse Source 
see #4788
This commit is contained in:
SomberNight
2018-10-21 14:58:55 +02:00
parent ef2a6359e4
commit 6958c0ccc3
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/simple_config.py
View File

@@ -140,6 +140,12 @@ class SimpleConfig(PrintError):
if not self.is_modifiable(key): if not self.is_modifiable(key):
self.print_stderr("Warning: not changing config key '%s' set on the command line" % key) self.print_stderr("Warning: not changing config key '%s' set on the command line" % key)
return return
try:
json.dumps(key)
json.dumps(value)
except:
self.print_error(f"json error: cannot save {repr(key)} ({repr(value)})")
return
self._set_key_in_user_config(key, value, save) self._set_key_in_user_config(key, value, save)
def _set_key_in_user_config(self, key, value, save=True): def _set_key_in_user_config(self, key, value, save=True):

2
electrum/storage.py
View File

@@ -90,7 +90,7 @@ class JsonDB(PrintError):
json.dumps(key, cls=util.MyEncoder) json.dumps(key, cls=util.MyEncoder)
json.dumps(value, cls=util.MyEncoder) json.dumps(value, cls=util.MyEncoder)
except: except:
self.print_error("json error: cannot save", key) self.print_error(f"json error: cannot save {repr(key)} ({repr(value)})")
return return
with self.db_lock: with self.db_lock:
if value is not None: if value is not None: