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

1 files changed, 4 insertions, 5 deletions

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
index e10b1c7..c6cef6d 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;

 }