MdeModulePkg Pcd(DXE): Use correct TokenNumber to call GetPtrTypeSize () when SKU...

[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 b082f0a6de60dd329e4e027a5825d23270850ae0..3a41bf531689d0e94fb4e99f803fe7374edfd502 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -50,6 +50,7 @@ GetLocalTokenNumber (
   IN UINTN              TokenNumber\r
   )\r
 {\r
+  UINTN                 TmpTokenNumber;\r
   UINT32                *LocalTokenNumberTable;\r
   UINT32                LocalTokenNumber;\r
   UINTN                 Size;\r
@@ -62,6 +63,11 @@ GetLocalTokenNumber (
   //\r
   TokenNumber--;\r
 \r
+  //\r
+  // Backup the TokenNumber passed in as GetPtrTypeSize need the original TokenNumber\r
+  // \r
+  TmpTokenNumber = TokenNumber;\r
+\r
   LocalTokenNumberTable  = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) : \r
                                      (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);\r
   TokenNumber            = IsPeiDb ? TokenNumber : TokenNumber - mPeiLocalTokenCount;\r
@@ -72,7 +78,7 @@ GetLocalTokenNumber (
 \r
   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     if (Size == 0) {\r
-      GetPtrTypeSize (TokenNumber, &MaxSize);\r
+      GetPtrTypeSize (TmpTokenNumber, &MaxSize);\r
     } else {\r
       MaxSize = Size;\r
     }\r