mirrors/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-05-09 13:52:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add FFS volume parser for non-AMI NVRAM areas

Browse source
This commit is contained in:
Nikolaj Schlej 2025-03-07 12:17:31 +07:00
parent 4e2a8f6bd7
commit 01e2e0877b
1 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
common/nvramparser.cpp
View file

@ -1251,7 +1251,39 @@ USTATUS NvramParser::parseNvramVolumeBody(const UModelIndex & index,const UINT32
throw 0;
}
storeOffset += ucodeHeader->TotalSize - 1;
UINT32 storeSize = ucodeHeader->TotalSize;
storeOffset += storeSize - 1;
previousStoreEndOffset = storeOffset + 1;
continue;
} catch (...) {
// Parsing failed, try something else
}
// FFS volume
try {
// Check data size
if (volumeBodySize - storeOffset < sizeof(EFI_FIRMWARE_VOLUME_HEADER)) {
throw 0;
}
// Check volume header candidate
const EFI_FIRMWARE_VOLUME_HEADER* volumeHeader = (const EFI_FIRMWARE_VOLUME_HEADER*)(volumeBody.constData() + storeOffset);
if (volumeHeader->Signature != EFI_FV_SIGNATURE) {
throw 0;
}
// All checks passed, volume found
UByteArray volume = volumeBody.mid(storeOffset);
UModelIndex volumeIndex;
if (U_SUCCESS != ffsParser->parseVolumeHeader(volume, storeOffset, index, volumeIndex)) {
throw 0;
}
(VOID)ffsParser->parseVolumeBody(volumeIndex);
UINT32 storeSize = (UINT32)(model->header(volumeIndex).size() + model->body(volumeIndex).size());
storeOffset += storeSize - 1;
previousStoreEndOffset = storeOffset + 1;
continue;
} catch (...) {