From 3534cbb7a33fd3a65d3f9a442f2d6298cae2ce95 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Mon, 26 Jun 2006 13:41:23 +0000 Subject: 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 --- MdePkg/Library/DxePcdLib/DxePcdLib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'MdePkg/Library/DxePcdLib/DxePcdLib.c') diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c index fe7ae4247c..ec5da259a6 100644 --- a/MdePkg/Library/DxePcdLib/DxePcdLib.c +++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c @@ -513,8 +513,10 @@ LibPcdSetPtr ( { EFI_STATUS Status; UINTN Size; - - ASSERT ((*SizeOfBuffer > 0) && Buffer == NULL); + + if (*SizeOfBuffer > 0) { + ASSERT (Buffer != NULL); + } Size = LibPcdGetSize (TokenNumber); @@ -726,8 +728,9 @@ LibPcdSetExPtr ( EFI_STATUS Status; UINTN Size; - ASSERT (Guid != NULL); - ASSERT (Buffer != NULL); + if (*SizeOfBuffer > 0) { + ASSERT (Buffer != NULL); + } Size = LibPcdGetExSize (Guid, TokenNumber); if (*SizeOfBuffer > Size) { -- cgit v1.2.3