Fix a potential bug that GetLanguages() API may return incorrect languages in a strin...

[mirror_edk2.git] / MdeModulePkg / Universal / HiiDatabaseDxe / Database.c

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index fab12670d96175e7c76c53529f6eec77827d24a0..b1a3374991ecadc58a5361d5694f7c4fa1c4648b 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -877,13 +877,13 @@ InsertStringPackage (
 \r
 Error:\r
 \r
-  if (StringPackage->StringBlock != NULL) {\r
-    FreePool (StringPackage->StringBlock);\r
-  }\r
-  if (StringPackage->StringPkgHdr != NULL) {\r
-    FreePool (StringPackage->StringPkgHdr);\r
-  }\r
   if (StringPackage != NULL) {\r
+    if (StringPackage->StringBlock != NULL) {\r
+      FreePool (StringPackage->StringBlock);\r
+    }\r
+    if (StringPackage->StringPkgHdr != NULL) {\r
+      FreePool (StringPackage->StringPkgHdr);\r
+    }\r
     FreePool (StringPackage);\r
   }\r
   return Status;\r
@@ -1182,10 +1182,10 @@ Error:
   if (FontInfo != NULL) {\r
     FreePool (FontInfo);\r
   }\r
-  if (FontPackage->GlyphBlock != NULL) {\r
-    FreePool (FontPackage->GlyphBlock);\r
-  }\r
   if (FontPackage != NULL) {\r
+    if (FontPackage->GlyphBlock != NULL) {\r
+      FreePool (FontPackage->GlyphBlock);\r
+    }\r
     FreePool (FontPackage);\r
   }\r
   if (GlobalFont != NULL) {\r
@@ -1713,10 +1713,10 @@ InsertSimpleFontPackage (
 \r
 Error:\r
 \r
-  if (SimpleFontPackage->SimpleFontPkgHdr != NULL) {\r
-    FreePool (SimpleFontPackage->SimpleFontPkgHdr);\r
-  }\r
   if (SimpleFontPackage != NULL) {\r
+    if (SimpleFontPackage->SimpleFontPkgHdr != NULL) {\r
+      FreePool (SimpleFontPackage->SimpleFontPkgHdr);\r
+    }\r
     FreePool (SimpleFontPackage);\r
   }\r
   return Status;\r
@@ -2158,10 +2158,11 @@ InsertKeyboardLayoutPackage (
 \r
 Error:\r
 \r
-  if (KeyboardLayoutPackage->KeyboardPkg != NULL) {\r
-    FreePool (KeyboardLayoutPackage->KeyboardPkg);\r
-  }\r
+\r
   if (KeyboardLayoutPackage != NULL) {\r
+    if (KeyboardLayoutPackage->KeyboardPkg != NULL) {\r
+      FreePool (KeyboardLayoutPackage->KeyboardPkg);\r
+    }\r
     FreePool (KeyboardLayoutPackage);\r
   }\r
 \r
@@ -2555,7 +2556,7 @@ ExportPackageList (
   UINTN                               ResultSize;\r
   EFI_HII_PACKAGE_HEADER              EndofPackageList;\r
 \r
-  ASSERT (Private != NULL || PackageList != NULL || UsedSize != NULL);\r
+  ASSERT (Private != NULL && PackageList != NULL && UsedSize != NULL);\r
   ASSERT (Private->Signature == HII_DATABASE_PRIVATE_DATA_SIGNATURE);\r
   ASSERT (IsHiiHandleValid (Handle));\r
 \r