From 763cfa739b1733715fe6700a29ec078c36453f5e Mon Sep 17 00:00:00 2001 From: Dandan Bi Date: Fri, 24 Jun 2016 13:19:14 +0800 Subject: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add ASSERT before using the pointer 'String' The 'Sting' is returned by the function GetUnicodeStringTextAndSize. If it is NULL, function GetUnicodeStringTextAndSize will return EFI_OUT_OF_RESOURCES, and error handling codes will cover it. So the pointer 'Sting' can not be NULL when using it. So we can add the ASSERT codes. Cc: Eric Dong Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi Reviewed-by: Hao Wu --- .../Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index 03f8141199..6682319711 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -875,7 +875,7 @@ GetStringIdFromString ( if (EFI_ERROR (Status)) { goto Done; } - + ASSERT (String != NULL); if (StrCmp(KeywordValue, String) == 0) { *StringId = CurrentStringId; goto Done; @@ -895,7 +895,7 @@ GetStringIdFromString ( if (EFI_ERROR (Status)) { goto Done; } - + ASSERT (String != NULL); if (StrCmp(KeywordValue, String) == 0) { *StringId = CurrentStringId; goto Done; @@ -914,7 +914,7 @@ GetStringIdFromString ( if (EFI_ERROR (Status)) { goto Done; } - + ASSERT (String != NULL); BlockSize += StringSize; if (StrCmp(KeywordValue, String) == 0) { *StringId = CurrentStringId; @@ -939,7 +939,7 @@ GetStringIdFromString ( if (EFI_ERROR (Status)) { goto Done; } - + ASSERT (String != NULL); BlockSize += StringSize; if (StrCmp(KeywordValue, String) == 0) { *StringId = CurrentStringId; -- 2.39.2