jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-27 10:28:22 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fixes #376
This commit is contained in:
Nikolaj Schlej 2023-11-02 12:44:09 -07:00
parent e0b1e0205f
commit 6f9a4c0d46
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/meparser.cpp
View File

@ -375,7 +375,7 @@ USTATUS MeParser::parseIfwi16Region(const UByteArray & region, const UModelIndex
partitions.push_back(partition); partitions.push_back(partition);
} }
// Add boot partitions // 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) { if (ifwiHeader->BootPartition[i].Offset != 0 && ifwiHeader->BootPartition[i].Offset != 0xFFFFFFFF) {
IFWI_PARTITION_INFO partition = {}; IFWI_PARTITION_INFO partition = {};
partition.type = Types::IfwiPartition; partition.type = Types::IfwiPartition;
@ -551,7 +551,7 @@ USTATUS MeParser::parseIfwi17Region(const UByteArray & region, const UModelIndex
partitions.push_back(partition); partitions.push_back(partition);
} }
// Add boot partitions // 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) { if (ifwiHeader->BootPartition[i].Offset != 0 && ifwiHeader->BootPartition[i].Offset != 0xFFFFFFFF) {
IFWI_PARTITION_INFO partition = {}; IFWI_PARTITION_INFO partition = {};
partition.type = Types::IfwiPartition; partition.type = Types::IfwiPartition;
@ -671,8 +671,15 @@ make_partition_table_consistent:
} }
else if (partitions[i].subtype == Subtypes::BootIfwiPartition) { else if (partitions[i].subtype == Subtypes::BootIfwiPartition) {
// Parse code partition contents // Parse code partition contents
UModelIndex bootPartitionBpdtRegionIndex; UModelIndex bootPartitionRegionIndex;
ffsParser->parseBpdtRegion(partition, 0, 0, partitionIndex, bootPartitionBpdtRegionIndex); 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) { else if (partitions[i].type == Types::Padding) {