1.enhanced security check.

[mirror_edk2.git] / MdeModulePkg / Universal / PCD / Dxe / Service.c

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index f07c107412ff9c68b922988fcc0bd31c51e2d67f..9ef83ef658db09011140a38de74f50d367e90d4a 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -106,8 +106,8 @@ GetWorker (
   }\r
 \r
   PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
-  StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
-                          mPcdDatabase->DxeDb.Init.StringTable;\r
+  StringTable = (UINT16 *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.StringTable[0] :\r
+                                      &mPcdDatabase->DxeDb.Init.StringTable[0]);\r
   \r
   Offset     = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
   \r
@@ -118,8 +118,8 @@ GetWorker (
       break;\r
       \r
     case PCD_TYPE_HII:\r
-      GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
-                              mPcdDatabase->DxeDb.Init.GuidTable;\r
+      GuidTable   = (EFI_GUID *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.GuidTable[0] :\r
+                                            &mPcdDatabase->DxeDb.Init.GuidTable[0]);\r
                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r
@@ -761,8 +761,8 @@ SetWorker (
 \r
   PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
 \r
-  StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
-                          mPcdDatabase->DxeDb.Init.StringTable;\r
+  StringTable = (UINT16 *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.StringTable[0] :\r
+                                      &mPcdDatabase->DxeDb.Init.StringTable[0]);\r
   \r
   InternalData = PcdDb + Offset;\r
 \r
@@ -789,8 +789,8 @@ SetWorker (
         }\r
       }\r
       \r
-      GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
-                              mPcdDatabase->DxeDb.Init.GuidTable;\r
+      GuidTable   = (EFI_GUID *) (IsPeiDb ? &mPcdDatabase->PeiDb.Init.GuidTable[0] :\r
+                                            &mPcdDatabase->DxeDb.Init.GuidTable[0]);\r
                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r