From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.92.20.91]) by mx.groups.io with SMTP id smtpd.web10.5092.1597191883560152823 for ; Tue, 11 Aug 2020 17:24:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=JKn8Ve7y; spf=pass (domain: outlook.com, ip: 40.92.20.91, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A/HZkt/XHhRZo2q/2k/gZss3c7tlS6+oIKlgwe4xwte5a4Q53IGW//PuOnsvHa6h6YiJr0aQDzC/df8wztolECZy52OwgPn9aMe+62Y7+3+gGuopsMOzKBEmwnqgoducUxGxkWeO+Y4jCXVvGwva9GtRzC0juBC5tR1W05Kj225hqaKTlCZRp1iwvsCeQyp9TP7CUj8CGHs8WY8DLXT85M5PDOmPjIDxmwxs4gQu+BikggtgdooP39WKUwnzwRU7Af2AdXmmeK7KQnJPOa0l26TblLW1MUtQiSh19e50/blfZfFTL5wNwHek9ph3Nxg2Vjrffk+PD2d/kulUd3Aovg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BxMNiQuj6DkWX3NIuX+MOU4u1b5dJku4a0uqI0LXwgs=; b=Frmwx/2y9kX6Mxoq3QKPxXpbJ2GoQLGRqOCc30yrYirkPhvdcZra7PzDiApO6C/i9TA8FK4dABC6Xm5sp+eQsV8cl3R7OPYopYtWd1uaFgNngMb/9bqHQcwp/4Su0V+rpPTZAhOA2HMx5bxnZ2pKd8Lqm9R7E1M60FTD2Y+Qzr4yaVIH1xkbu3BM4MJNXGI2d/pL04o83/06AXY/HiyvysfEr5ugJvI5TMvQ3Iwd2AHFOVx99dHvnzsVqi6XYXK3HgsxEKlB/bh974FIQ9O9gqTbwwqX5ob6Tng1nohluI7/bgCS8ARNAhSmS1VBjaTkxrjn25DISWdbS1EvgurEEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BxMNiQuj6DkWX3NIuX+MOU4u1b5dJku4a0uqI0LXwgs=; b=JKn8Ve7yhGCB6CHBotyssDqZp+jiqXlB7kepPYPdcgvkhdW+ZullCbPlA2kJXVghg9eS4buG0IU5soHwdRAqU9iuzzmwn9mJUMC7swBOmyT982ZrxcjwxjwIwLu5Q0Ea9K7pfLKEi0DkXHdTtaidQqYraGL117n6p0Qnkf9oVswRifQQ4ZEORR1ob6nhTOV4rvRBt+rWGZyNsJ3aUdbpTJGpnEpOuKwRQdoZEFUISXevJorK9KH0WzZHHQeYE5KZl0EJ7onV1wwjXljZkWt/jky2yCNx7ZZ7zJGQ3M4s5RrmUCTHWjYSDxVoy4uxCZhOJVUP7RXz3TXo22OV945roQ== Received: from CO1NAM11FT038.eop-nam11.prod.protection.outlook.com (2a01:111:e400:3861::4f) by CO1NAM11HT017.eop-nam11.prod.protection.outlook.com (2a01:111:e400:3861::418) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.16; Wed, 12 Aug 2020 00:24:35 +0000 Received: from MWHPR07MB3440.namprd07.prod.outlook.com (2a01:111:e400:3861::4d) by CO1NAM11FT038.mail.protection.outlook.com (2a01:111:e400:3861::231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.16 via Frontend Transport; Wed, 12 Aug 2020 00:24:35 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7E8EF4C14AD87B3C85FCDCEB1B7C058CC1FFDC2418173897B9C1AAA9180D1FC4;UpperCasedChecksum:9B330CA210935FE2363F52352955BC8C6D7772BB19CD5552EEF12865FF06F09F;SizeAsReceived:7654;Count:47 Received: from MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::9856:570e:1735:974e]) by MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::9856:570e:1735:974e%7]) with mapi id 15.20.3261.025; Wed, 12 Aug 2020 00:24:35 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io CC: Liming Gao , Michael D Kinney , Guomin Jiang , Wei6 Xu Subject: [PATCH v1 1/1] FmpDevicePkg/FmpDxe: Fix Clang build error Date: Tue, 11 Aug 2020 17:23:57 -0700 Message-ID: X-Mailer: git-send-email 2.28.0.windows.1 X-ClientProxiedBy: MWHPR1201CA0015.namprd12.prod.outlook.com (2603:10b6:301:4a::25) To MWHPR07MB3440.namprd07.prod.outlook.com (2603:10b6:301:69::28) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200812002357.875-1-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:7:d55d:5724:5f2b:636a) by MWHPR1201CA0015.namprd12.prod.outlook.com (2603:10b6:301:4a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.15 via Frontend Transport; Wed, 12 Aug 2020 00:24:34 +0000 X-Mailer: git-send-email 2.28.0.windows.1 X-Microsoft-Original-Message-ID: <20200812002357.875-1-michael.kubacki@outlook.com> X-TMN: [Ib5F+Em0cDPTMsUh1SjTzlp/fNqh+pBsBwLq1Z2qPZZwO6qpsyih65hGUiqggnQE] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8df91255-e93e-4df3-3694-08d83e56172f X-MS-TrafficTypeDiagnostic: CO1NAM11HT017: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mQDgseOjl1SV5kJ1kivvMlz3Eglkv9CTP9gpGD64PdxKLaf4nBqCSFvK9VpIxTCs9ip1FW3d3ukP8uLtaomXTHo2cGweyulBlnUjN9zgzpDE7WbkofFmOevAMKEqAET/3L2tMQBW+mO/SZIbb0rQ2s4HE55cm3qp/MiQKNStrFblSU5lVIzFc2OkNq5wNagyjaLqKLjRVcx9Q133R6Pqs8tXw+ZUHdzURE/ZQIzDw1A7YvC3IPZWNsj36BMUHYqY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR07MB3440.namprd07.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: HnscbrPYSZAvaA022JdhIVLIzaIpHLI6eviuVpUVFiyDb86P6Mkngjp2jBInSht+1iU9LFwwjZHzU1JFUswzBXQrj6l9VWtWGp6DfayKH38zM8+Sug8hxu5L82mYeYDvPEkUPSTzuyOkUZcDA22wXFUVNoIQbEXA6Lx/j+Lc8+N3sz0lbj01zxRvLxb7JNzjEQZe7Zvses8rVZw5qAk7Iw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8df91255-e93e-4df3-3694-08d83e56172f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2020 00:24:35.2603 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1NAM11HT017 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Michael Kubacki REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2887 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 Cc: Michael D Kinney Cc: Guomin Jiang Cc: Wei6 Xu Signed-off-by: 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; =20 Status =3D EFI_SUCCESS; + Private =3D NULL; Updateable =3D 0; BooleanValue =3D FALSE; FmpHeaderSize =3D 0; @@ -1293,7 +1294,10 @@ SetTheImage ( =20 cleanup: mProgressFunc =3D NULL; - SetLastAttemptStatusInVariable (Private, LastAttemptStatus); + + if (Private !=3D NULL) { + SetLastAttemptStatusInVariable (Private, LastAttemptStatus); + } =20 if (Progress !=3D NULL) { // @@ -1306,7 +1310,9 @@ SetTheImage ( // Need repopulate after SetImage is called to // update LastAttemptVersion and LastAttemptStatus. // - Private->DescriptorPopulated =3D FALSE; + if (Private !=3D NULL) { + Private->DescriptorPopulated =3D FALSE; + } =20 return Status; } --=20 2.28.0.windows.1