1 files changed, 9 insertions, 2 deletions
diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index ec5da259a6..b746614d5b 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -57,6 +57,8 @@ LibPcdSetSku (
   IN UINTN  SkuId
   )
 {
+  ASSERT (SkuId < 0x100);
+
   mPcd->SetSku (SkuId);
 
   return SkuId;
@@ -728,10 +730,15 @@ LibPcdSetExPtr (
   EFI_STATUS  Status;
   UINTN       Size;
 
+  ASSERT (Guid != NULL);
+
+  ASSERT (SizeOfBuffer != NULL);
+
   if (*SizeOfBuffer > 0) {
     ASSERT (Buffer != NULL);
   }
 
+
   Size = LibPcdGetExSize (Guid, TokenNumber);
   if (*SizeOfBuffer > Size) {
     *SizeOfBuffer = Size;
@@ -901,7 +908,7 @@ LibPcdGetNextToken (
   @retval CONST GUID *  The next valid token namespace.
 
 **/
-CONST GUID*           
+GUID *           
 EFIAPI
 LibPcdGetNextTokenSpace (
   IN CONST GUID  *Guid
@@ -913,6 +920,6 @@ LibPcdGetNextTokenSpace (
 
   ASSERT_EFI_ERROR (Status);
 
-  return Guid;
+  return (GUID *) Guid;
 }