Fix K8 check error.

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / RuntimeDxe / Variable.c

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index f89d6ed1c96cc6fe548cbcb9ec54134a31e4fe12..98da3b8b792a1b8bebc2e45975cd9098ca572aaa 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -2051,7 +2051,7 @@ FvbNotificationEvent (
   //\r
   // Get the FVB to access variable store\r
   //\r
-  for (Index = 0; Index < HandleCount; Index += 1, Status = EFI_NOT_FOUND) {\r
+  for (Index = 0; Index < HandleCount; Index += 1, Status = EFI_NOT_FOUND, Fvb = NULL) {\r
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiFirmwareVolumeBlockProtocolGuid,\r
@@ -2086,7 +2086,7 @@ FvbNotificationEvent (
   }\r
 \r
   FreePool (HandleBuffer);\r
-  if (!EFI_ERROR (Status)) {\r
+  if (!EFI_ERROR (Status) && Fvb != NULL) {\r
     Status = VariableCommonInitialize (Fvb);\r
     ASSERT_EFI_ERROR (Status);\r
   \r