diff options
| author | Star Zeng <star.zeng@intel.com> | 2018-07-28 09:16:54 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2018-08-03 08:09:06 +0800 |
| commit | 32648dca708e1dffe786160bf56b0357df8324cc (patch) | |
| tree | 4aaf3aa2c3b17baf472642dcbf9f6eeeb6cd330f | |
| parent | 14b912543387592232e0834644a0444b6afcf79c (diff) | |
| download | edk2-32648dca708e1dffe786160bf56b0357df8324cc.tar.gz edk2-32648dca708e1dffe786160bf56b0357df8324cc.tar.bz2 edk2-32648dca708e1dffe786160bf56b0357df8324cc.zip | |
FmpDevicePkg FmpDxe: Add NULL check to return Value from GetVariable2
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
(cherry picked from commit b1be077fa4e1c5fc61ec0df0c9691bd07943406a)
| -rw-r--r-- | FmpDevicePkg/FmpDxe/VariableSupport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/FmpDevicePkg/FmpDxe/VariableSupport.c b/FmpDevicePkg/FmpDxe/VariableSupport.c index c15178d099..6a4330ad6a 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;
}
|