sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Eric Dong
2013-07-16 05:09:47 +00:00
committed by ydong10
parent 0086fca024
commit 40ae09a2a7
2 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Library/UefiHiiLib/HiiLib.c
View File

@ -1001,6 +1001,7 @@ ValidateQuestionFromVfr (
) )
{ {
IFR_BLOCK_DATA VarBlockData; IFR_BLOCK_DATA VarBlockData;
UINT8 *TmpBuffer;
UINT16 Offset; UINT16 Offset;
UINT16 Width; UINT16 Width;
UINT64 VarValue; UINT64 VarValue;
@ -1031,6 +1032,7 @@ ValidateQuestionFromVfr (
Index = 0; Index = 0;
VarStoreName = NULL; VarStoreName = NULL;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
TmpBuffer = NULL;
VarValue = 0; VarValue = 0;
IfrVarStore = NULL; IfrVarStore = NULL;
IfrNameValueStore = NULL; IfrNameValueStore = NULL;
@ -1584,12 +1586,16 @@ GetBlockDataInfo (
LIST_ENTRY *Link; LIST_ENTRY *Link;
UINTN MaxBufferSize; UINTN MaxBufferSize;
EFI_STATUS Status; EFI_STATUS Status;
CHAR8 *VarStoreName;
UINTN Index;
IFR_BLOCK_DATA *BlockArray; IFR_BLOCK_DATA *BlockArray;
UINT8 *DataBuffer; UINT8 *DataBuffer;
// //
// Initialize the local variables. // Initialize the local variables.
// //
Index = 0;
VarStoreName = NULL;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
BlockData = NULL; BlockData = NULL;
NewBlockData = NULL; NewBlockData = NULL;

10
MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
View File

@ -1433,12 +1433,20 @@ ParseIfrData (
CHAR16 *VarStoreName; CHAR16 *VarStoreName;
UINT16 VarWidth; UINT16 VarWidth;
UINT16 VarDefaultId; UINT16 VarDefaultId;
EFI_STRING GuidStr;
EFI_STRING NameStr;
EFI_STRING TempStr;
UINTN LengthString;
BOOLEAN FirstOneOfOption; BOOLEAN FirstOneOfOption;
LIST_ENTRY *LinkData; LIST_ENTRY *LinkData;
LIST_ENTRY *LinkDefault; LIST_ENTRY *LinkDefault;
EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore; EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;
LengthString = 0;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
GuidStr = NULL;
NameStr = NULL;
TempStr = NULL;
BlockData = NULL; BlockData = NULL;
DefaultDataPtr = NULL; DefaultDataPtr = NULL;
FirstOneOfOption = FALSE; FirstOneOfOption = FALSE;
@ -2867,6 +2875,7 @@ GetFullStringFromHiiFormPackages (
EFI_STRING ConfigHdr; EFI_STRING ConfigHdr;
EFI_STRING StringPtr; EFI_STRING StringPtr;
EFI_STRING Progress; EFI_STRING Progress;
BOOLEAN DataExist;
if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) { if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -2882,6 +2891,7 @@ GetFullStringFromHiiFormPackages (
ConfigHdr = NULL; ConfigHdr = NULL;
HiiFormPackage = NULL; HiiFormPackage = NULL;
PackageSize = 0; PackageSize = 0;
DataExist = FALSE;
Progress = *Request; Progress = *Request;
Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize); Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);