MdeModulePkg HiiDataBase: Fix the potential NULL pointer access

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index 4a2dc8d0304399810344f05b5d246a57f5f3d66b..e8f4564e6478e3b2f10fc18bb249f438c6b3b662 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -721,9 +721,14 @@ FindQuestionDefaultSetting (
       VariableStorage = NULL;\r
     }\r
     Entry = AllocatePool (sizeof (VARSTORAGE_DEFAULT_DATA));\r
-    Entry->DefaultId = DefaultId;\r
-    Entry->VariableStorage = VariableStorage;\r
-    InsertTailList (&gVarStorageList, &Entry->Entry);\r
+    if (Entry != NULL) {\r
+      Entry->DefaultId = DefaultId;\r
+      Entry->VariableStorage = VariableStorage;\r
+      InsertTailList (&gVarStorageList, &Entry->Entry);\r
+    } else if (VariableStorage != NULL) {\r
+      FreePool (VariableStorage);\r
+      VariableStorage = NULL;\r
+    }\r
   }\r
   //\r
   // The matched variable storage is not found.\r