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

Fallback to RawArea parsing in case IntelDescriptor or Capsule parsing was unsuccesful

Browse Source
This commit is contained in:
Nikolaj Schlej 2023-02-18 08:28:15 -08:00
parent 6f9dc0ab88
commit 2d1ebcc11b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/ffsparser.cpp
View File

@ -110,18 +110,14 @@ USTATUS FfsParser::performFirstPass(const UByteArray & buffer, UModelIndex & ind
return U_INVALID_PARAMETER;
}
USTATUS result;
// Try parsing as UEFI Capsule
result = parseCapsule(buffer, 0, UModelIndex(), index);;
if (result != U_ITEM_NOT_FOUND) {
return result;
if (U_SUCCESS == parseCapsule(buffer, 0, UModelIndex(), index)) {
return U_SUCCESS;
}
// Try parsing as Intel image
result = parseIntelImage(buffer, 0, UModelIndex(), index);
if (result != U_ITEM_NOT_FOUND) {
return result;
if (U_SUCCESS == parseIntelImage(buffer, 0, UModelIndex(), index)) {
return U_SUCCESS;
}
// Parse as generic image
@ -274,9 +270,8 @@ USTATUS FfsParser::parseCapsule(const UByteArray & capsule, const UINT32 localOf
UModelIndex imageIndex;
// Try parsing as Intel image
USTATUS result = parseIntelImage(image, capsuleHeaderSize, index, imageIndex);
if (result != U_ITEM_NOT_FOUND) {
return result;
if (U_SUCCESS == parseIntelImage(image, capsuleHeaderSize, index, imageIndex)) {
return U_SUCCESS;
}
// Parse as generic image