enhanced security check.

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

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index f07c107412ff9c68b922988fcc0bd31c51e2d67f..977db39d422190450cc75977f6df2f18f55f09a6 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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index a1367574b0df0c7f11957def1b57ff1c882f0675..0671558b5738e103e398f3d289b80b81cce5a19a 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -231,8 +231,8 @@ DisplayPageFrame (
            Alignment < BANNER_COLUMNS + (UINT8) LocalScreen.LeftColumn;\r
            Alignment++\r
           ) {\r
-        RowIdx = Line - (UINT8) LocalScreen.TopRow;\r
-        ColumnIdx = Alignment - (UINT8) LocalScreen.LeftColumn;\r
+        RowIdx = (UINT8) (Line - (UINT8) LocalScreen.TopRow);\r
+        ColumnIdx = (UINT8) (Alignment - (UINT8) LocalScreen.LeftColumn);\r
 \r
         ASSERT (RowIdx < BANNER_HEIGHT);\r
         ASSERT (ColumnIdx < BANNER_COLUMNS);\r