diff options
| author | Eric Dong <eric.dong@intel.com> | 2013-07-16 05:09:47 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-07-16 05:09:47 +0000 |
| commit | 40ae09a2a77740e08731fc79bc3d22f043ea3128 (patch) | |
| tree | d1edc025dcb12e296f2ce4a25bc299d9e899b0b4 /MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | |
| parent | 0086fca024d3ada1073a061f141ca898d8009ca9 (diff) | |
| download | edk2-platforms-40ae09a2a77740e08731fc79bc3d22f043ea3128.tar.xz | |
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
Diffstat (limited to 'MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c')
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 58 |
1 files changed, 34 insertions, 24 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index 95ca8d4777..a83a2ff777 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -1430,18 +1430,26 @@ ParseIfrData ( IFR_DEFAULT_DATA DefaultData;
IFR_DEFAULT_DATA *DefaultDataPtr;
IFR_BLOCK_DATA *BlockData;
- CHAR16 *VarStoreName; - UINT16 VarWidth; - UINT16 VarDefaultId; - BOOLEAN FirstOneOfOption; - LIST_ENTRY *LinkData; - LIST_ENTRY *LinkDefault; - EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore; - - Status = EFI_SUCCESS; - BlockData = NULL; - DefaultDataPtr = NULL; - FirstOneOfOption = FALSE; + 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;
ZeroMem (&DefaultData, sizeof (IFR_DEFAULT_DATA));
//
@@ -2864,12 +2872,13 @@ GetFullStringFromHiiFormPackages ( IFR_DEFAULT_DATA *DefaultIdArray;
IFR_VARSTORAGE_DATA *VarStorageData;
EFI_STRING DefaultAltCfgResp;
- EFI_STRING ConfigHdr; - EFI_STRING StringPtr; - EFI_STRING Progress; - - if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) { - return EFI_INVALID_PARAMETER; + EFI_STRING ConfigHdr;
+ EFI_STRING StringPtr;
+ EFI_STRING Progress;
+ BOOLEAN DataExist;
+
+ if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {
+ return EFI_INVALID_PARAMETER;
}
//
@@ -2879,12 +2888,13 @@ GetFullStringFromHiiFormPackages ( DefaultIdArray = NULL;
VarStorageData = NULL;
DefaultAltCfgResp = NULL;
- ConfigHdr = NULL; - HiiFormPackage = NULL; - PackageSize = 0; - Progress = *Request; - - Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize); + ConfigHdr = NULL;
+ HiiFormPackage = NULL;
+ PackageSize = 0;
+ DataExist = FALSE;
+ Progress = *Request;
+
+ Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);
if (EFI_ERROR (Status)) {
return Status;
}
|