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

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

@ -998,12 +998,13 @@ ValidateQuestionFromVfr (
IN CHAR16 *RequestElement, IN CHAR16 *RequestElement,
IN EFI_HII_HANDLE HiiHandle, IN EFI_HII_HANDLE HiiHandle,
IN BOOLEAN NameValueType IN BOOLEAN NameValueType
) )
{ {
IFR_BLOCK_DATA VarBlockData; IFR_BLOCK_DATA VarBlockData;
UINT16 Offset; UINT8 *TmpBuffer;
UINT16 Width; UINT16 Offset;
UINT64 VarValue; UINT16 Width;
UINT64 VarValue;
EFI_IFR_TYPE_VALUE TmpValue; EFI_IFR_TYPE_VALUE TmpValue;
EFI_STATUS Status; EFI_STATUS Status;
EFI_HII_PACKAGE_HEADER PacakgeHeader; EFI_HII_PACKAGE_HEADER PacakgeHeader;
@ -1028,12 +1029,13 @@ ValidateQuestionFromVfr (
// //
// Initialize the local variables. // Initialize the local variables.
// //
Index = 0; Index = 0;
VarStoreName = NULL; VarStoreName = NULL;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
VarValue = 0; TmpBuffer = NULL;
IfrVarStore = NULL; VarValue = 0;
IfrNameValueStore = NULL; IfrVarStore = NULL;
IfrNameValueStore = NULL;
IfrEfiVarStore = NULL; IfrEfiVarStore = NULL;
ZeroMem (&VarStoreData, sizeof (IFR_VARSTORAGE_DATA)); ZeroMem (&VarStoreData, sizeof (IFR_VARSTORAGE_DATA));
ZeroMem (&VarBlockData, sizeof (VarBlockData)); ZeroMem (&VarBlockData, sizeof (VarBlockData));
@ -1581,18 +1583,22 @@ GetBlockDataInfo (
UINT8 *TmpBuffer; UINT8 *TmpBuffer;
UINT16 Offset; UINT16 Offset;
UINT16 Width; UINT16 Width;
LIST_ENTRY *Link; LIST_ENTRY *Link;
UINTN MaxBufferSize; UINTN MaxBufferSize;
EFI_STATUS Status; EFI_STATUS Status;
IFR_BLOCK_DATA *BlockArray; CHAR8 *VarStoreName;
UINT8 *DataBuffer; UINTN Index;
IFR_BLOCK_DATA *BlockArray;
// UINT8 *DataBuffer;
// Initialize the local variables.
// //
Status = EFI_SUCCESS; // Initialize the local variables.
BlockData = NULL; //
NewBlockData = NULL; Index = 0;
VarStoreName = NULL;
Status = EFI_SUCCESS;
BlockData = NULL;
NewBlockData = NULL;
TmpBuffer = NULL; TmpBuffer = NULL;
BlockArray = NULL; BlockArray = NULL;
MaxBufferSize = HII_LIB_DEFAULT_VARSTORE_SIZE; MaxBufferSize = HII_LIB_DEFAULT_VARSTORE_SIZE;

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

@ -1430,18 +1430,26 @@ ParseIfrData (
IFR_DEFAULT_DATA DefaultData; IFR_DEFAULT_DATA DefaultData;
IFR_DEFAULT_DATA *DefaultDataPtr; IFR_DEFAULT_DATA *DefaultDataPtr;
IFR_BLOCK_DATA *BlockData; IFR_BLOCK_DATA *BlockData;
CHAR16 *VarStoreName; CHAR16 *VarStoreName;
UINT16 VarWidth; UINT16 VarWidth;
UINT16 VarDefaultId; UINT16 VarDefaultId;
BOOLEAN FirstOneOfOption; EFI_STRING GuidStr;
LIST_ENTRY *LinkData; EFI_STRING NameStr;
LIST_ENTRY *LinkDefault; EFI_STRING TempStr;
EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore; UINTN LengthString;
BOOLEAN FirstOneOfOption;
Status = EFI_SUCCESS; LIST_ENTRY *LinkData;
BlockData = NULL; LIST_ENTRY *LinkDefault;
DefaultDataPtr = NULL; EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;
FirstOneOfOption = FALSE;
LengthString = 0;
Status = EFI_SUCCESS;
GuidStr = NULL;
NameStr = NULL;
TempStr = NULL;
BlockData = NULL;
DefaultDataPtr = NULL;
FirstOneOfOption = FALSE;
ZeroMem (&DefaultData, sizeof (IFR_DEFAULT_DATA)); ZeroMem (&DefaultData, sizeof (IFR_DEFAULT_DATA));
// //
@ -2864,12 +2872,13 @@ GetFullStringFromHiiFormPackages (
IFR_DEFAULT_DATA *DefaultIdArray; IFR_DEFAULT_DATA *DefaultIdArray;
IFR_VARSTORAGE_DATA *VarStorageData; IFR_VARSTORAGE_DATA *VarStorageData;
EFI_STRING DefaultAltCfgResp; EFI_STRING DefaultAltCfgResp;
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) {
return EFI_INVALID_PARAMETER; if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {
return EFI_INVALID_PARAMETER;
} }
// //
@ -2879,12 +2888,13 @@ GetFullStringFromHiiFormPackages (
DefaultIdArray = NULL; DefaultIdArray = NULL;
VarStorageData = NULL; VarStorageData = NULL;
DefaultAltCfgResp = NULL; DefaultAltCfgResp = NULL;
ConfigHdr = NULL; ConfigHdr = NULL;
HiiFormPackage = NULL; HiiFormPackage = NULL;
PackageSize = 0; PackageSize = 0;
Progress = *Request; DataExist = FALSE;
Progress = *Request;
Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);
Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }