tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not assert in HiiBlockToConfig function when an invalid format of ConfigRequest is inputed, just return error. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11526 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2011-04-13 03:13:13 +00:00
parent 6878e7a7be
commit 3a530010ec
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,8 +453,9 @@ GetValueOfNumber (
UINTN Index; UINTN Index;
CHAR16 TemStr[2]; CHAR16 TemStr[2];
ASSERT (StringPtr != NULL && Number != NULL && Len != NULL); if (StringPtr == NULL || *StringPtr == L'\0' || Number == NULL || Len == NULL) {
ASSERT (*StringPtr != L'\0'); return EFI_INVALID_PARAMETER;
}
Buf = NULL; Buf = NULL;
@ -3103,7 +3104,7 @@ HiiBlockToConfig (
// Get Offset // Get Offset
// //
Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length); Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
if (Status == EFI_OUT_OF_RESOURCES) { if (EFI_ERROR (Status)) {
*Progress = ConfigRequest; *Progress = ConfigRequest;
goto Exit; goto Exit;
} }
@ -3127,7 +3128,7 @@ HiiBlockToConfig (
// Get Width // Get Width
// //
Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length); Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
if (Status == EFI_OUT_OF_RESOURCES) { if (EFI_ERROR (Status)) {
*Progress = ConfigRequest; *Progress = ConfigRequest;
goto Exit; goto Exit;
} }
@ -3394,7 +3395,7 @@ HiiConfigToBlock (
// Get Width // Get Width
// //
Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length); Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);
if (Status == EFI_OUT_OF_RESOURCES) { if (EFI_ERROR (Status)) {
*Progress = ConfigResp; *Progress = ConfigResp;
goto Exit; goto Exit;
} }