uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FmpDevicePkg/FmpDxe: Fix Clang build error

Browse source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2887

The local Private pointer variable in SetTheImage() is initialized
based on the caller provided This pointer argument. The cleanup
label path uses the Private pointer which will not be
initialized if This is NULL.

This change initializes Private to NULL and accounts for Private
potentially being NULL in the cleanup label path.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Wei6 Xu <wei6.xu@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Tested-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Guomin Jiang <guomin.jiang@intel.com>
This commit is contained in:
Michael Kubacki 2020-08-12 08:23:57 +08:00 • committed by mergify[bot]
parent e0eacd7daa
commit 3633d5309f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
FmpDevicePkg/FmpDxe/FmpDxe.c
View file

@ -1043,6 +1043,7 @@ SetTheImage (
UINT32 DependenciesSize;
Status = EFI_SUCCESS;
Private = NULL;
Updateable = 0;
BooleanValue = FALSE;
FmpHeaderSize = 0;
@ -1293,7 +1294,10 @@ SetTheImage (
cleanup:
mProgressFunc = NULL;
SetLastAttemptStatusInVariable (Private, LastAttemptStatus);
if (Private != NULL) {
SetLastAttemptStatusInVariable (Private, LastAttemptStatus);
}
if (Progress != NULL) {
//
@ -1306,7 +1310,9 @@ cleanup:
// Need repopulate after SetImage is called to
// update LastAttemptVersion and LastAttemptStatus.
//
Private->DescriptorPopulated = FALSE;
if (Private != NULL) {
Private->DescriptorPopulated = FALSE;
}
return Status;
}