From 1d433a8c4b3d022d41b8dc8752108e26467a386f Mon Sep 17 00:00:00 2001
From: theubusu <80545678+theubusu@users.noreply.github.com>
Date: Sun, 19 Oct 2025 15:53:39 +0200
Subject: [PATCH] fix Mediatek "iMtK" header handling

---
 src/formats/mtk_pkg.rs            | 12 ++----------
 src/formats/mtk_upgrade_loader.rs | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/formats/mtk_pkg.rs b/src/formats/mtk_pkg.rs
index 3b3af28..7e144ca 100644
--- a/src/formats/mtk_pkg.rs
+++ b/src/formats/mtk_pkg.rs
@@ -122,16 +122,8 @@ pub fn extract_mtk_pkg(mut file: &File, output_folder: &str) -> Result<(), Box<d
 
         //strip iMtK thing
         let extra_header_len = if &out_data[48..52] == b"iMtK" {
-            let imtk_len = u32::from_le_bytes(out_data[56..60].try_into().unwrap());
-            let imtk_content = common::string_from_bytes(&out_data[60..60 + imtk_len as usize]);
-            println!("iMtK Info: {}", imtk_content);
-
-            if &out_data[60 + imtk_len as usize..(60 + imtk_len as usize) + 4] == b"iPAd" {
-                //println!("iPAd found!");
-                64
-            } else {
-                imtk_len + 12
-            }
+            let imtk_len = u32::from_le_bytes(out_data[52..56].try_into().unwrap());
+            imtk_len + 8
         } else {
             0
         };
diff --git a/src/formats/mtk_upgrade_loader.rs b/src/formats/mtk_upgrade_loader.rs
index 286f3c3..032c676 100644
--- a/src/formats/mtk_upgrade_loader.rs
+++ b/src/formats/mtk_upgrade_loader.rs
@@ -43,16 +43,8 @@ pub fn extract_mtk_upgrade_loader(mut file: &File, output_folder: &str) -> Resul
 
         //strip iMtK thing
         let extra_header_len = if &data[0..4] == b"iMtK" {
-            let imtk_len = u32::from_le_bytes(data[8..12].try_into().unwrap());
-            let imtk_content = common::string_from_bytes(&data[12..12 + imtk_len as usize]);
-            println!("iMtK Info: {}", imtk_content);
-
-            if &data[12 + imtk_len as usize..(12 + imtk_len as usize) + 4] == b"iPAd" {
-                //println!("iPAd found!");
-                64
-            } else {
-                imtk_len + 12
-            }
+            let imtk_len = u32::from_le_bytes(data[4..8].try_into().unwrap());
+            imtk_len + 8
         } else {
             0
         };