Fixed jffs2valid.py Python3 bugs

4f1a9baf · devttys0 · acae7cb2 · 4f1a9baf
Commit 4f1a9baf authored 10 years ago by devttys0
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

jffs2valid.py src/binwalk/plugins/jffs2valid.py +4 -1

No files found.
--- a/src/binwalk/plugins/jffs2valid.py
+++ b/src/binwalk/plugins/jffs2valid.py
@@ -13,8 +13,11 @@ class JFFS2ValidPlugin(binwalk.core.plugin.Plugin):
    MODULES = ['Signature']

    def _check_crc(self, node_header):
+        # struct and binascii want a bytes object in Python3
+        node_header = binwalk.core.compat.str2bytes(node_header)
+
        # Get the header's reported CRC value
-        if node_header[0:2] == "\x19\x85":
+        if node_header[0:2] == b"\x19\x85":
            header_crc = struct.unpack(">I", node_header[8:12])[0]
        else:
            header_crc = struct.unpack("<I", node_header[8:12])[0]