From 2295075793e53e4b158b1e2eddaac4e5b602e8a7 Mon Sep 17 00:00:00 2001 From: Dandan Bi Date: Mon, 24 Aug 2015 06:25:50 +0000 Subject: [PATCH] MdeModulePkg:Refine the code in HiiDatabaseDxe Check the local variable 'NameSpace' before use it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi Reviewed-by: Eric Dong Reviewed-by: Qiu Shumin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18274 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index eac7717053..e88a0c4597 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -2852,6 +2852,7 @@ EfiConfigKeywordHandlerSetData ( *ProgressErr = KEYWORD_HANDLER_MALFORMED_STRING; goto Done; } + ASSERT (NameSpace != NULL); // // 1.1 Check whether the input namespace is valid. // @@ -3136,9 +3137,11 @@ EfiConfigKeywordHandlerGetData ( // // 1.1 Check whether the input namespace is valid. // - if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) { - *ProgressErr = KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR; - return EFI_INVALID_PARAMETER; + if (NameSpace != NULL){ + if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) { + *ProgressErr = KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR; + return EFI_INVALID_PARAMETER; + } } if (KeywordString != NULL) { -- 2.39.2