Revision: 18274
http://sourceforge.net/p/edk2/code/18274
Author: dandanbi
Date: 2015-08-24 06:25:50 +0000 (Mon, 24 Aug 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Eric Dong <[email protected]>
Reviewed-by: Qiu Shumin <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
Modified:
trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
2015-08-24 05:49:24 UTC (rev 18273)
+++ trunk/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
2015-08-24 06:25:50 UTC (rev 18274)
@@ -2852,6 +2852,7 @@
*ProgressErr = KEYWORD_HANDLER_MALFORMED_STRING;
goto Done;
}
+ ASSERT (NameSpace != NULL);
//
// 1.1 Check whether the input namespace is valid.
//
@@ -3136,9 +3137,11 @@
//
// 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) {
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
