Fix off-by-one error in parsing IFWI partition table

Fixes #376
LongSoft · Nov 2, 2023 · 6f9a4c0 · 6f9a4c0
1 parent e0b1e02
commit 6f9a4c0
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/common/meparser.cpp b/common/meparser.cpp
@@ -375,7 +375,7 @@ USTATUS MeParser::parseIfwi16Region(const UByteArray & region, const UModelIndex
         partitions.push_back(partition);
     }
     // Add boot partitions
-    for (UINT8 i = 0 ; i < 4; i++) {
+    for (UINT8 i = 0 ; i < 5; i++) {
         if (ifwiHeader->BootPartition[i].Offset != 0 && ifwiHeader->BootPartition[i].Offset != 0xFFFFFFFF) {
             IFWI_PARTITION_INFO partition = {};
             partition.type = Types::IfwiPartition;
@@ -551,7 +551,7 @@ USTATUS MeParser::parseIfwi17Region(const UByteArray & region, const UModelIndex
         partitions.push_back(partition);
     }
     // Add boot partitions
-    for (UINT8 i = 0 ; i < 4; i++) {
+    for (UINT8 i = 0 ; i < 5; i++) {
         if (ifwiHeader->BootPartition[i].Offset != 0 && ifwiHeader->BootPartition[i].Offset != 0xFFFFFFFF) {
             IFWI_PARTITION_INFO partition = {};
             partition.type = Types::IfwiPartition;
@@ -671,8 +671,15 @@ USTATUS MeParser::parseIfwi17Region(const UByteArray & region, const UModelIndex
             }
             else if (partitions[i].subtype == Subtypes::BootIfwiPartition) {
                 // Parse code partition contents
-                UModelIndex bootPartitionBpdtRegionIndex;
-                ffsParser->parseBpdtRegion(partition, 0, 0, partitionIndex, bootPartitionBpdtRegionIndex);
+                UModelIndex bootPartitionRegionIndex;
+                if (*(UINT32*)partition.constData() == FPT_HEADER_SIGNATURE) {
+                    // Parse as FptRegion
+                    parseFptRegion(partition, partitionIndex, bootPartitionRegionIndex);
+                }
+                else {
+                    // Parse as BpdtRegion
+                    ffsParser->parseBpdtRegion(partition, 0, 0, partitionIndex, bootPartitionRegionIndex);
+                }
             }
         }
         else if (partitions[i].type == Types::Padding) {