1 files changed, 6 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index f5e054d265..4caf361bd2 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -2329,6 +2329,8 @@ GetBlockElement (
   IFR_BLOCK_DATA       *NextBlockData;
   UINTN                Length;
 
+  TmpBuffer = NULL;
+
   //
   // Init RequestBlockArray
   //
@@ -4432,6 +4434,8 @@ HiiBlockToConfig (
   CHAR16                              *TemString;
   CHAR16                              TemChar;
 
+  TmpBuffer = NULL;
+
   if (This == NULL || Progress == NULL || Config == NULL) {
     return EFI_INVALID_PARAMETER;
   }
@@ -4728,6 +4732,8 @@ HiiConfigToBlock (
   UINTN                               BufferSize;
   UINTN                               MaxBlockSize;
 
+  TmpBuffer = NULL;
+
   if (This == NULL || BlockSize == NULL || Progress == NULL) {
     return EFI_INVALID_PARAMETER;
   }