Update PCD driver to correctly set the HII type PCDs.

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

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 8ec34523865c28673e1caa1164c1600adea44dbf..532bb39cc40ae78955a0878f3dfb68cfea9dbd74 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -975,8 +975,10 @@ SetHiiVariable (
   VOID        *Buffer;\r
   EFI_STATUS  Status;\r
   UINT32      Attribute;\r
+  UINTN       SetSize;\r
 \r
   Size = 0;\r
+  SetSize = 0;\r
 \r
   //\r
   // Try to get original variable size information.\r
@@ -988,14 +990,17 @@ SetHiiVariable (
     &Size,\r
     NULL\r
     );\r
-\r
+  \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     //\r
     // Patch new PCD's value to offset in given HII variable.\r
     //\r
-    \r
-    Buffer = AllocatePool (Size);\r
-\r
+    if  (Size >= (DataSize + Offset)) {\r
+      SetSize = Size;\r
+    } else {\r
+      SetSize = DataSize + Offset;\r
+    }\r
+    Buffer = AllocatePool (SetSize);\r
     ASSERT (Buffer != NULL);\r
 \r
     Status = gRT->GetVariable (\r
@@ -1014,13 +1019,12 @@ SetHiiVariable (
               VariableName,\r
               VariableGuid,\r
               Attribute,\r
-              Size,\r
+              SetSize,\r
               Buffer\r
               );\r
 \r
     FreePool (Buffer);\r
     return Status;\r
-\r
   } else if (Status == EFI_NOT_FOUND) {\r
     //\r
     // If variable does not exist, a new variable need to be created.\r