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
This commit is contained in:
@ -1001,6 +1001,7 @@ ValidateQuestionFromVfr (
|
||||
)
|
||||
{
|
||||
IFR_BLOCK_DATA VarBlockData;
|
||||
UINT8 *TmpBuffer;
|
||||
UINT16 Offset;
|
||||
UINT16 Width;
|
||||
UINT64 VarValue;
|
||||
@ -1031,6 +1032,7 @@ ValidateQuestionFromVfr (
|
||||
Index = 0;
|
||||
VarStoreName = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
TmpBuffer = NULL;
|
||||
VarValue = 0;
|
||||
IfrVarStore = NULL;
|
||||
IfrNameValueStore = NULL;
|
||||
@ -1584,12 +1586,16 @@ GetBlockDataInfo (
|
||||
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;
|
||||
|
@ -1433,12 +1433,20 @@ ParseIfrData (
|
||||
CHAR16 *VarStoreName;
|
||||
UINT16 VarWidth;
|
||||
UINT16 VarDefaultId;
|
||||
EFI_STRING GuidStr;
|
||||
EFI_STRING NameStr;
|
||||
EFI_STRING TempStr;
|
||||
UINTN LengthString;
|
||||
BOOLEAN FirstOneOfOption;
|
||||
LIST_ENTRY *LinkData;
|
||||
LIST_ENTRY *LinkDefault;
|
||||
EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;
|
||||
|
||||
LengthString = 0;
|
||||
Status = EFI_SUCCESS;
|
||||
GuidStr = NULL;
|
||||
NameStr = NULL;
|
||||
TempStr = NULL;
|
||||
BlockData = NULL;
|
||||
DefaultDataPtr = NULL;
|
||||
FirstOneOfOption = FALSE;
|
||||
@ -2867,6 +2875,7 @@ GetFullStringFromHiiFormPackages (
|
||||
EFI_STRING ConfigHdr;
|
||||
EFI_STRING StringPtr;
|
||||
EFI_STRING Progress;
|
||||
BOOLEAN DataExist;
|
||||
|
||||
if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
@ -2882,6 +2891,7 @@ GetFullStringFromHiiFormPackages (
|
||||
ConfigHdr = NULL;
|
||||
HiiFormPackage = NULL;
|
||||
PackageSize = 0;
|
||||
DataExist = FALSE;
|
||||
Progress = *Request;
|
||||
|
||||
Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);
|
||||
|
Reference in New Issue
Block a user