From c59634eab662fe4cc79a27827f9fc90f40f78523 Mon Sep 17 00:00:00 2001
From: jji4 <jji4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 19 Jan 2009 06:55:18 +0000
Subject: [PATCH] Source level security checked

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7303 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/HiiDatabaseDxe/ConfigRouting.c  |  2 +-
 .../Universal/HiiDatabaseDxe/Database.c       | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 8bcd498e77..36cf919b42 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -302,8 +302,8 @@ AppendToMultiString (
                                   MultiStringSize + AppendStringSize,
                                   (VOID *) (*MultiString)
                                   );
+    ASSERT (*MultiString != NULL);
   }
-
   //
   // Append the incoming string
   //
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index fab12670d9..3d70207952 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -877,13 +877,13 @@ InsertStringPackage (
 
 Error:
 
-  if (StringPackage->StringBlock != NULL) {
-    FreePool (StringPackage->StringBlock);
-  }
-  if (StringPackage->StringPkgHdr != NULL) {
-    FreePool (StringPackage->StringPkgHdr);
-  }
   if (StringPackage != NULL) {
+    if (StringPackage->StringBlock != NULL) {
+      FreePool (StringPackage->StringBlock);
+    }
+    if (StringPackage->StringPkgHdr != NULL) {
+      FreePool (StringPackage->StringPkgHdr);
+    }
     FreePool (StringPackage);
   }
   return Status;
@@ -1182,10 +1182,10 @@ Error:
   if (FontInfo != NULL) {
     FreePool (FontInfo);
   }
-  if (FontPackage->GlyphBlock != NULL) {
-    FreePool (FontPackage->GlyphBlock);
-  }
   if (FontPackage != NULL) {
+    if (FontPackage->GlyphBlock != NULL) {
+      FreePool (FontPackage->GlyphBlock);
+    }
     FreePool (FontPackage);
   }
   if (GlobalFont != NULL) {
@@ -1713,10 +1713,10 @@ InsertSimpleFontPackage (
 
 Error:
 
-  if (SimpleFontPackage->SimpleFontPkgHdr != NULL) {
-    FreePool (SimpleFontPackage->SimpleFontPkgHdr);
-  }
   if (SimpleFontPackage != NULL) {
+    if (SimpleFontPackage->SimpleFontPkgHdr != NULL) {
+      FreePool (SimpleFontPackage->SimpleFontPkgHdr);
+    }
     FreePool (SimpleFontPackage);
   }
   return Status;
@@ -2158,10 +2158,11 @@ InsertKeyboardLayoutPackage (
 
 Error:
 
-  if (KeyboardLayoutPackage->KeyboardPkg != NULL) {
-    FreePool (KeyboardLayoutPackage->KeyboardPkg);
-  }
+
   if (KeyboardLayoutPackage != NULL) {
+    if (KeyboardLayoutPackage->KeyboardPkg != NULL) {
+      FreePool (KeyboardLayoutPackage->KeyboardPkg);
+    }
     FreePool (KeyboardLayoutPackage);
   }
 
-- 
2.39.2