Reviewed-by: Yuwei Chen<[email protected]> > -----Original Message----- > From: Feng, Bob C <[email protected]> > Sent: Tuesday, May 25, 2021 2:20 PM > To: [email protected] > Cc: Liming Gao <[email protected]>; Chen, Christine > <[email protected]> > Subject: [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is > no fv ext_header > > FMMT will crash if there is no fv ext_header in a specific FV. > This patch is going to add a check point for this case. > > Signed-off-by: Bob Feng <[email protected]> > Cc: Liming Gao <[email protected]> > Cc: Yuwei Chen <[email protected]> > --- > BaseTools/Source/C/FMMT/FmmtLib.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c > b/BaseTools/Source/C/FMMT/FmmtLib.c > index fa77ed7317..4f6056edba 100644 > --- a/BaseTools/Source/C/FMMT/FmmtLib.c > +++ b/BaseTools/Source/C/FMMT/FmmtLib.c > @@ -4544,16 +4544,18 @@ LibEncapNewFvFile( > if (CurrentEncapData != NULL) { > LocalEncapData = CurrentEncapData; > while (LocalEncapData->Level != ParentLevel) { > LocalEncapData = LocalEncapData->NextNode; > } > + if (LocalEncapData->FvExtHeader !=NULL) { > for (Index = 0; Index <= FvInFd->FfsNumbers; Index++) { > if ((memcmp(&FvInFd->FfsAttuibutes[Index].GuidName, > &(LocalEncapData->FvExtHeader->FvName), sizeof(EFI_GUID)) == 0)) { > SubFvId = Index; > break; > } > } > + } > } > // > // Found FFSs from Fv structure. > // > FfsFoundFlag = FALSE; > -- > 2.29.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#75748): https://edk2.groups.io/g/devel/message/75748 Mute This Topic: https://groups.io/mt/83070312/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
