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 <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18274 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
index eac7717053bc443bb9397b43963328843deb04b9..e88a0c45975fb9a3352d3069008d164902f48f29 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
@@ -2852,6 +2852,7 @@ EfiConfigKeywordHandlerSetData (
       *ProgressErr = KEYWORD_HANDLER_MALFORMED_STRING;\r
       goto Done;\r
     }\r
+    ASSERT (NameSpace != NULL);\r
     //\r
     // 1.1 Check whether the input namespace is valid.\r
     //\r
@@ -3136,9 +3137,11 @@ EfiConfigKeywordHandlerGetData (
   //\r
   // 1.1 Check whether the input namespace is valid.\r
   //\r
-  if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) {\r
-    *ProgressErr = KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR;\r
-    return EFI_INVALID_PARAMETER;\r
+  if (NameSpace != NULL){\r
+    if (AsciiStrnCmp(NameSpace, UEFI_CONFIG_LANG, AsciiStrLen (UEFI_CONFIG_LANG)) != 0) {\r
+      *ProgressErr = KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR;\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
   }\r
   \r
   if (KeywordString != NULL) {\r