Rollback patch 14470, because it error check in some extra ending code.

Signed-off-by: Eric Dong <eric.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14473 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 30 insertions, 24 deletions

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 4ef64428bb..87aeb947ae 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -998,12 +998,13 @@ ValidateQuestionFromVfr (
   IN CHAR16                        *RequestElement,

   IN EFI_HII_HANDLE                HiiHandle,

   IN BOOLEAN                       NameValueType

-  )
-{
-  IFR_BLOCK_DATA               VarBlockData;
-  UINT16                       Offset;
-  UINT16                       Width;
-  UINT64                       VarValue;
+  )

+{

+  IFR_BLOCK_DATA               VarBlockData;

+  UINT8                        *TmpBuffer;

+  UINT16                       Offset;

+  UINT16                       Width;

+  UINT64                       VarValue;

   EFI_IFR_TYPE_VALUE           TmpValue;

   EFI_STATUS                   Status;

   EFI_HII_PACKAGE_HEADER       PacakgeHeader;

@@ -1028,12 +1029,13 @@ ValidateQuestionFromVfr (
   //

   // Initialize the local variables.

   //

-  Index             = 0;
-  VarStoreName      = NULL;
-  Status            = EFI_SUCCESS;
-  VarValue          = 0;
-  IfrVarStore       = NULL;
-  IfrNameValueStore = NULL;
+  Index             = 0;

+  VarStoreName      = NULL;

+  Status            = EFI_SUCCESS;

+  TmpBuffer         = NULL;

+  VarValue          = 0;

+  IfrVarStore       = NULL;

+  IfrNameValueStore = NULL;

   IfrEfiVarStore    = NULL;

   ZeroMem (&VarStoreData, sizeof (IFR_VARSTORAGE_DATA));

   ZeroMem (&VarBlockData, sizeof (VarBlockData));

@@ -1581,18 +1583,22 @@ GetBlockDataInfo (
   UINT8                        *TmpBuffer;

   UINT16                       Offset;

   UINT16                       Width;

-  LIST_ENTRY                   *Link;
-  UINTN                        MaxBufferSize;
-  EFI_STATUS                   Status;
-  IFR_BLOCK_DATA               *BlockArray;
-  UINT8                        *DataBuffer;
-  
-  //
-  // Initialize the local variables.
-  //
-  Status        = EFI_SUCCESS;
-  BlockData     = NULL;
-  NewBlockData  = NULL;
+  LIST_ENTRY                   *Link;

+  UINTN                        MaxBufferSize;

+  EFI_STATUS                   Status;

+  CHAR8                        *VarStoreName;

+  UINTN                        Index;

+  IFR_BLOCK_DATA               *BlockArray;

+  UINT8                        *DataBuffer;

+  

+  //

+  // Initialize the local variables.

+  //

+  Index         = 0;

+  VarStoreName  = NULL;

+  Status        = EFI_SUCCESS;

+  BlockData     = NULL;

+  NewBlockData  = NULL;

   TmpBuffer     = NULL;

   BlockArray    = NULL;

   MaxBufferSize = HII_LIB_DEFAULT_VARSTORE_SIZE;