MdeModulePkg PCD: Fix TmpTokenSpaceBufferCount not assigned correctly

[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 9ab456624fc7086427c6a446d58d71acc28ab48d..efe72483c5e65be554f7cfb99fb7ee10b1d57ec0 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -2,7 +2,8 @@
     Help functions used by PCD DXE driver.\r
 \r
 Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -451,7 +452,7 @@ GetWorker (
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r
-      RetPtr = (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r
+      RetPtr = (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r
 \r
       break;\r
 \r
@@ -715,7 +716,7 @@ ExGetNextTokeNumber (
     }\r
 \r
     for ( ; Index < ExMapTableCount; Index++) {\r
-      if (ExMapTable[Index].ExTokenNumber == *TokenNumber) {\r
+      if ((ExMapTable[Index].ExTokenNumber == *TokenNumber) && (ExMapTable[Index].ExGuidIndex == GuidTableIdx)) {\r
         break;\r
       }\r
     }\r
@@ -958,7 +959,7 @@ GetSkuEnabledTokenNumber (
 {\r
   SKU_HEAD              *SkuHead;\r
   SKU_ID                *SkuIdTable;\r
-  INTN                  Index;\r
+  UINTN                 Index;\r
   UINT8                 *Value;\r
   UINT8                 *PcdDb;\r
   BOOLEAN               FoundSku;\r