From 4a1102c9aedce3e4244efcc822794e9cc6da4dee Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 21 Jan 2009 05:33:41 +0000
Subject: K8: 1) add in more ASSERT condition and updates the comment for
 HexStringToBuf. 2) Check the pointer returned by HiiLibGetHiiHandles.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7324 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Library/UefiHiiLib/HiiString.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'MdeModulePkg/Library/UefiHiiLib')

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
index e10b1c72ee..c6cef6dc62 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiString.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
@@ -325,8 +325,8 @@ HiiLibGetStringFromToken (
   EFI_GUID        Guid;
 
   Status = HiiLibGetHiiHandles (&HandleBufferLen, &HiiHandleBuffer);
-  if (EFI_ERROR(Status)) {
-    return Status;
+  if (HiiHandleBuffer == NULL) {
+    return EFI_NOT_FOUND;
   }
   for (Index = 0; Index < (HandleBufferLen / sizeof (EFI_HII_HANDLE)); Index++) {
     Status = HiiLibExtractGuidFromHiiHandle (HiiHandleBuffer[Index], &Guid);
@@ -350,9 +350,8 @@ HiiLibGetStringFromToken (
   Status = HiiLibGetStringFromHandle (HiiHandleBuffer[Index], StringId, String);
 
 Out:
-  if (HiiHandleBuffer != NULL) {
-    FreePool (HiiHandleBuffer);
-  }
+  FreePool (HiiHandleBuffer);
+
   return Status;
 }
 
-- 
cgit v1.2.3