-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael Kubacki
Sent: 2020年8月12日 8:24
To: devel@edk2.groups.io
Cc: Gao, Liming <liming.gao@...>; Kinney, Michael D <michael.d.kinney@...>; Jiang, Guomin <guomin.jiang@...>; Xu, Wei6 <wei6.xu@...>
Subject: [edk2-devel] [PATCH v1 1/1] FmpDevicePkg/FmpDxe: Fix Clang build error

From: Michael Kubacki <michael.kubacki@...>

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@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Cc: Guomin Jiang <guomin.jiang@...>
Cc: Wei6 Xu <wei6.xu@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
---
FmpDevicePkg/FmpDxe/FmpDxe.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c b/FmpDevicePkg/FmpDxe/FmpDxe.c index 854feec0a162..427b215ddc5f 100644
--- a/FmpDevicePkg/FmpDxe/FmpDxe.c
+++ b/FmpDevicePkg/FmpDxe/FmpDxe.c
@@ -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 @@ SetTheImage (
// Need repopulate after SetImage is called to
// update LastAttemptVersion and LastAttemptStatus.
//
- Private->DescriptorPopulated = FALSE;
+ if (Private != NULL) {
+ Private->DescriptorPopulated = FALSE; }

return Status;
}
--
2.28.0.windows.1