From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3E6C421BADAB2 for ; Fri, 27 Jul 2018 18:19:12 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Jul 2018 18:19:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,411,1526367600"; d="scan'208";a="249647802" Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.158.46]) by fmsmga006.fm.intel.com with ESMTP; 27 Jul 2018 18:18:56 -0700 From: Star Zeng To: edk2-devel@lists.01.org Cc: Star Zeng , Michael D Kinney Date: Sat, 28 Jul 2018 09:18:55 +0800 Message-Id: <1532740735-14128-1-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [staging/FmpDevicePkg-master][PATCH] FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 01:19:13 -0000 Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng --- FmpDevicePkg/FmpDxe/VariableSupport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FmpDevicePkg/FmpDxe/VariableSupport.c b/FmpDevicePkg/FmpDxe/VariableSupport.c index c15178d09914..6a4330ad6a83 100644 --- a/FmpDevicePkg/FmpDxe/VariableSupport.c +++ b/FmpDevicePkg/FmpDxe/VariableSupport.c @@ -72,7 +72,7 @@ GetVersionFromVariable ( Version = DEFAULT_VERSION; Status = GetVariable2 (VARNAME_VERSION, &gEfiCallerIdGuid, (VOID **)&Value, &Size); - if (EFI_ERROR (Status)) { + if (EFI_ERROR (Status) || (Value == NULL)) { DEBUG ((DEBUG_ERROR, "Failed to get the Version from variable. Status = %r\n", Status)); return Version; } @@ -125,7 +125,7 @@ GetLowestSupportedVersionFromVariable ( Version = DEFAULT_LOWESTSUPPORTEDVERSION; Status = GetVariable2 (VARNAME_LSV, &gEfiCallerIdGuid, (VOID **)&Value, &Size); - if (EFI_ERROR (Status)) { + if (EFI_ERROR (Status) || (Value == NULL)) { DEBUG ((DEBUG_WARN, "Warning: Failed to get the Lowest Supported Version from variable. Status = %r\n", Status)); return Version; } @@ -177,7 +177,7 @@ GetLastAttemptStatusFromVariable ( LastAttemptStatus = DEFAULT_LASTATTEMPT; Status = GetVariable2 (VARNAME_LASTATTEMPTSTATUS, &gEfiCallerIdGuid, (VOID **)&Value, &Size); - if (EFI_ERROR (Status)) { + if (EFI_ERROR (Status) || (Value == NULL)) { DEBUG ((DEBUG_WARN, "Warning: Failed to get the Last Attempt Status from variable. Status = %r\n", Status)); return LastAttemptStatus; } @@ -233,7 +233,7 @@ GetLastAttemptVersionFromVariable ( Version = DEFAULT_LASTATTEMPT; Status = GetVariable2 (VARNAME_LASTATTEMPTVERSION, &gEfiCallerIdGuid, (VOID **)&Value, &Size); - if (EFI_ERROR (Status)) { + if (EFI_ERROR (Status) || (Value == NULL)) { DEBUG ((DEBUG_WARN, "Warning: Failed to get the Last Attempt Version from variable. Status = %r\n", Status)); return Version; } -- 2.7.0.windows.1