Make sure the PCD dxe service driver can handle the case where no PEIM is using any dynamic PCD entry and the PEI phase PCD database is empty.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@388 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 17 insertions, 6 deletions

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index e1aded74f9..bccd0a600a 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -282,13 +282,24 @@ BuildPcdDxeDataBase (
   ASSERT (mPcdDatabase != NULL);

 

   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);

-  ASSERT (GuidHob != NULL);

 

-  PeiDatabase = (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);

-  //

-  // Copy PCD Entries refereneced in PEI phase to PCD DATABASE

-  //

-  CopyMem (&mPcdDatabase->PeiDb, PeiDatabase, sizeof (PEI_PCD_DATABASE));

+  if (GuidHob != NULL) {

+

+    //

+    // We will copy over the PEI phase's PCD Database.

+    // 

+    // If no PEIMs use dynamic Pcd Entry, the Pcd Service PEIM

+    // should not be included at all. So the GuidHob could

+    // be NULL. If it is NULL, we just copy over the DXE Default

+    // Value to PCD Database.

+    //

+    

+    PeiDatabase = (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);

+    //

+    // Copy PCD Entries refereneced in PEI phase to PCD DATABASE

+    //

+    CopyMem (&mPcdDatabase->PeiDb, PeiDatabase, sizeof (PEI_PCD_DATABASE));

+  }

 

   //

   // Copy PCD Entries with default value to PCD DATABASE