1 files changed, 6 insertions, 1 deletions
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index bccd0a600a..00437f116c 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -24,7 +24,7 @@ Module Name: Service.c
 
 PCD_DATABASE * mPcdDatabase;
 
-LIST_ENTRY mCallbackFnTable[PCD_TOTAL_TOKEN_NUMBER];
+LIST_ENTRY *mCallbackFnTable;
 
 VOID *
 GetWorker (
@@ -310,6 +310,11 @@ BuildPcdDxeDataBase (
   //
   // Initialized the Callback Function Table
   //
+
+  if (PCD_TOTAL_TOKEN_NUMBER != 0) {
+    mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER);
+  }
+  
   for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {
     InitializeListHead (&mCallbackFnTable[Idx]);
   }