1) correct the assert condition for LibPcdSetPtr and LibPcdSetExPtr

2) make sure VOID* type dynamic PCD entry can handle ASCII string correctly.
3) correct one bug where if StringTable is empty the autogen.c won't compile.


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

1 files changed, 8 insertions, 2 deletions

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index a73d804797..4018e44f70 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -586,10 +586,12 @@ LibPcdSetPtr (
   PCD_PPI    *PcdPpi;

   UINTN      Size;

 

+  if (*SizeOfBuffer > 0) {

+    ASSERT (Buffer != NULL);

+  }

+

   PcdPpi = GetPcdPpiPtr ();

   

-  ASSERT ((*SizeOfBuffer > 0) && Buffer == NULL);

-

   Size = LibPcdGetSize (TokenNumber);

   

   if (*SizeOfBuffer > Size) {

@@ -813,6 +815,10 @@ LibPcdSetExPtr (
   PCD_PPI         *PcdPpi;

   UINTN           Size;

 

+  if (*SizeOfBuffer > 0) {

+    ASSERT (Buffer != NULL);

+  }

+

   PcdPpi = GetPcdPpiPtr ();

 

   Size = LibPcdGetExSize (Guid, TokenNumber);