[edk2-devel] [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is no fv ext_header

[Yuwei Chen]

Reviewed-by: Yuwei Chen<yuwei.chen at intel.com>

> -----Original Message-----
> From: Feng, Bob C <bob.c.feng at intel.com>
> Sent: Tuesday, May 25, 2021 2:20 PM
> To: devel at edk2.groups.io
> Cc: Liming Gao <gaoliming at byosoft.com.cn>; Chen, Christine
> <yuwei.chen at intel.com>
> 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 <bob.c.feng at intel.com>
> Cc: Liming Gao <gaoliming at byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen at intel.com>
> ---
>  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/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-