From: Star Zeng <star.zeng@intel.com>
Date: Mon, 23 Dec 2013 06:41:36 +0000 (+0000)
Subject: MdePkg PcdLib: Follow the comment of LibPcdGetNextToken to ASSERT when an invalid... 
X-Git-Tag: edk2-stable201903~11941
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=da660118bd391d1f421f99921f9f15a66a8fc7ea;hp=adcd7381bb2ab1108b13a838218d8d59e09b54d4

MdePkg PcdLib: Follow the comment of LibPcdGetNextToken to ASSERT when an invalid TokenNumber input.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15016 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index bc87c4e6a1..f14a746529 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -1002,7 +1002,10 @@ LibPcdGetNextToken (
   IN UINTN                    TokenNumber
   )
 {
-  GetPiPcdProtocol()->GetNextToken (Guid, &TokenNumber);
+  EFI_STATUS    Status;
+
+  Status = GetPiPcdProtocol()->GetNextToken (Guid, &TokenNumber);
+  ASSERT (!EFI_ERROR (Status) || TokenNumber == 0);
 
   return TokenNumber;
 }
diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index a57751f412..31ff457fc8 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -1010,7 +1010,10 @@ LibPcdGetNextToken (
   IN UINTN                    TokenNumber
   )
 {
-  (GetPiPcdPpiPointer ())->GetNextToken (Guid, &TokenNumber);
+  EFI_STATUS    Status;
+
+  Status = (GetPiPcdPpiPointer ())->GetNextToken (Guid, &TokenNumber);
+  ASSERT (!EFI_ERROR (Status) || TokenNumber == 0);
 
   return TokenNumber;
 }