Merge pull request #1292 from hitori1403/main

Fix partition slot handling in vbmeta patching for non-A/B devices
bkerler · Dec 12, 2024 · e80f288 · e80f288
2 parents e5524aa + 2475888
commit e80f288
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mtkclient/Library/DA/mtk_da_handler.py b/mtkclient/Library/DA/mtk_da_handler.py
@@ -240,7 +240,7 @@ def da_read_partition(self, partitionname, parttype="user"):
                                            length=rpartition.sectors * self.config.pagesize,
                                            filename="", parttype=parttype)
             return data
-        return None
+        return b""
 
     def da_write_partition(self, partitionname, data:bytes=None, parttype="user"):
         rpartition = None
@@ -677,6 +677,8 @@ def get_current_slot(self):
             tmp = self.da_read_partition("para")
         if tmp != b"":
             slot = tmp[0x800:0x802].decode('utf-8')
+            if slot == "\x00\x00":
+                slot = ""
         else:
             slot = ""
         return slot