From 4386f14350fa7d857212cd0619ca3259c227f11a Mon Sep 17 00:00:00 2001 From: qwang12 Date: Fri, 29 Aug 2008 05:35:16 +0000 Subject: [PATCH] Fix a bug in the assert condition. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5754 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/HiiLib/HiiString.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdePkg/Library/HiiLib/HiiString.c b/MdePkg/Library/HiiLib/HiiString.c index c7d11a5761..af867e1a1a 100644 --- a/MdePkg/Library/HiiLib/HiiString.c +++ b/MdePkg/Library/HiiLib/HiiString.c @@ -212,8 +212,8 @@ Out: This function try to retrieve string from String package of current language. If fails, it try to retrieve string from String package of first language it support. - If String is NULL, then ASSERT. If StringSize is NULL, then ASSERT. + If String is NULL and *StringSize is not 0, then ASSERT. If PackageList could not be found in the default HII database, then ASSERT. If StringId is not found in PackageList, then ASSERT. @@ -247,8 +247,8 @@ HiiLibGetString ( CHAR8 Lang[RFC_3066_ENTRY_SIZE]; CHAR8 CurrentLang[RFC_3066_ENTRY_SIZE]; - ASSERT (String != NULL); ASSERT (StringSize != NULL); + ASSERT (!(*StringSize != 0 && String == NULL)); ASSERT (IsHiiHandleRegistered (PackageList)); HiiLibGetCurrentLanguage (CurrentLang); -- 2.39.2