Don't crash on undecodable SSID's

seveas · seveas · commit ea936af0c8c4 · 2017-03-06T22:20:29.000+01:00
diff --git a/NetworkManager.py b/NetworkManager.py
@@ -13,6 +13,7 @@
 import struct
 import sys
 import time
+import warnings
 import weakref
 import xml.etree.ElementTree as etree
 
@@ -605,7 +606,12 @@ def base_to_python(val):
 
     @staticmethod
     def ssid_to_python(ssid):
-        return bytes().join(ssid).decode('utf-8')
+        try:
+            return bytes().join(ssid).decode('utf-8')
+        except UnicodeDecodeError:
+            ssid = bytes().join(ssid).decode('utf-8', 'replace')
+            warnings.warn("Unable to decode ssid %s properly" % ssid, UnicodeWarning)
+            return ssid
 
     @staticmethod
     def ssid_to_dbus(ssid):
