BaseTools: refactor and remove un-needed use of .keys() on dictionaries

[mirror_edk2.git] / SignedCapsulePkg / Universal / RecoveryModuleLoadPei / RecoveryModuleLoadPei.c

diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
index 58a15e49533db9b1abf8e6e70d6a8705c416c010..c22e3a487f3b03dad3359344661544c5b42c02ff 100644 (file)
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
@@ -9,7 +9,7 @@
   ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), ProcessRecoveryImage(),\r
   ValidateFmpCapsule() will receive untrusted input and do basic validation.\r
 \r
-Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -467,7 +467,7 @@ CreateHobForRecoveryCapsule (
   DEBUG((DEBUG_INFO, "BuildFvHob (FV in recovery) - 0x%lx - 0x%lx\n", (UINT64)(UINTN)FvHeader, FvHeader->FvLength));\r
 \r
   PeiServicesInstallFvInfoPpi(\r
-    NULL,\r
+    &FvHeader->FileSystemGuid,\r
     (VOID *)FvHeader,\r
     (UINT32)FvHeader->FvLength,\r
     NULL,\r
@@ -579,6 +579,9 @@ ProcessRecoveryImage (
   VOID                        *AuthenticatedImage;\r
   UINTN                       AuthenticatedImageSize;\r
 \r
+  AuthenticatedImage     = NULL;\r
+  AuthenticatedImageSize = 0;\r
+\r
   Status = CapsuleAuthenticateSystemFirmware(Image, Length, TRUE, &LastAttemptVersion, &LastAttemptStatus, &AuthenticatedImage, &AuthenticatedImageSize);\r
   if (EFI_ERROR(Status)) {\r
     DEBUG((DEBUG_INFO, "CapsuleAuthenticateSystemFirmware - %r\n", Status));\r