Fixes evilsocket#2 by gracefully handling UnicodeEncodeError exceptions.

issmonitor · Sep 24, 2017 · a0c47ca · a0c47ca
1 parent 86c783f
commit a0c47ca
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bleah/scan.py b/bleah/scan.py
@@ -137,8 +137,10 @@ def handleDiscovery(self, dev, isNewDev, isNewData):
 
             # short local name or complete local name
             elif tag in [8, 9]:
-                tdata.append([ desc, yellow( val.decode('utf-8') ) ])
-
+                try:
+                    tdata.append([ desc, yellow( val.decode('utf-8') ) ])
+                except UnicodeEncodeError:
+                    tdata.append([ desc, yellow( repr(val) ) ])
             else:
                 tdata.append([ desc, repr(val) ])