Fix some trouble, that can make phone brick, when rpmb is readed.

gl-niyin · Dec 3, 2021 · 2924021 · 2924021
1 parent aeba88f
commit 2924021
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/mtkclient/Library/utils.py b/mtkclient/Library/utils.py
@@ -52,7 +52,7 @@ def find_binary(data, strf, pos=0):
                             break
                         rt += len(t[i])
                     if error == 0:
-                        return offset
+                        return offset + pos
             else:
                 return None
         else:

diff --git a/mtkclient/Library/xflash_ext.py b/mtkclient/Library/xflash_ext.py
@@ -65,7 +65,17 @@ def patch(self):
                 mmc_get_card = find_binary(self.da2, b"\xA3\xEB\x00\x13\x18\x1A\x02\xEB\x00\x10")
                 if mmc_get_card is not None:
                     mmc_get_card -= 10
-            mmc_set_part_config = find_binary(self.da2, b"\xC3\x69\x0A\x46\x10\xB5")
+
+            pos = 0
+            while True:
+                mmc_set_part_config = find_binary(self.da2, b"\xC3\x69\x0A\x46\x10\xB5", pos)
+                if mmc_set_part_config is None:
+                    break
+                else:
+                    pos = mmc_set_part_config + 1
+                    if self.da2[mmc_set_part_config+20:mmc_set_part_config+22] == b"\xb3\x21":
+                        break
+
             if mmc_set_part_config is None:
                 mmc_set_part_config = find_binary(self.da2, b"\xC3\x69\x13\xF0\x01\x03")
             mmc_rpmb_send_command = find_binary(self.da2, b"\xF8\xB5\x06\x46\x9D\xF8\x18\x50")