Fix error when loading non-UTF data

toolCHAINZ · Oct 3, 2020 · e49eff3 · e49eff3
1 parent c77ef8b
commit e49eff3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/ihex_view.py b/ihex_view.py
@@ -6,10 +6,11 @@ class IHexView(BinaryView):
     name = "Intel HEX"
     @classmethod
     def is_valid_for_data(self, data: BinaryView):
-        actual_data = data.read(0, len(data)).decode('utf8')
-        if is_ihex(actual_data):
-            return True
-        return False
+        try:
+            actual_data = data.read(0, len(data)).decode('utf8')
+            return is_ihex(actual_data)
+        except:
+            return False
 
     def __init__(self, data: BinaryView):
         actual_data = data.read(0, len(data)).decode('utf8')

diff --git a/plugin.json b/plugin.json
@@ -24,6 +24,6 @@
       "Windows": "`py -m pip install bincopy`",
       "Linux": "`pip install bincopy`"
    },
-   "version": "1.0.1",
+   "version": "1.0.2",
    "minimumbinaryninjaversion": 2170
 }
diff --git a/srec_view.py b/srec_view.py
@@ -6,10 +6,11 @@ class SRECView(BinaryView):
     name = "Motorola SREC"
     @classmethod
     def is_valid_for_data(self, data: BinaryView):
-        actual_data = data.read(0, len(data)).decode('utf8')
-        if is_srec(actual_data):
-            return True
-        return False
+        try:
+            actual_data = data.read(0, len(data)).decode('utf8')
+            return is_srec(actual_data)
+        except:
+            return False
 
     def __init__(self, data: BinaryView):
         actual_data = data.read(0, len(data)).decode('utf8')

diff --git a/ti_txt_view.py b/ti_txt_view.py
@@ -6,10 +6,11 @@ class TiTxtView(BinaryView):
     name = "TI HEX"
     @classmethod
     def is_valid_for_data(self, data: BinaryView):
-        actual_data = data.read(0, len(data)).decode('utf8')
-        if is_ti_txt(actual_data):
-            return True
-        return False
+        try:
+            actual_data = data.read(0, len(data)).decode('utf8')
+            return is_ti_txt(actual_data)
+        except:
+            return False
 
     def __init__(self, data: BinaryView):
         actual_data = data.read(0, len(data)).decode('utf8')