diff options
| author | Eugene Cohen <eugene@hp.com> | 2015-12-11 03:07:59 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@Edk2> | 2015-12-11 03:07:59 +0000 |
| commit | a115a9efaade48982d7a9545644f75c2f1ccd0e6 (patch) | |
| tree | 7e8d6bb63517a49ab42d36333bb7fd1f645354f2 /MdeModulePkg/Universal | |
| parent | 65202874a4a0e576f5d18287a9e4821440faeec4 (diff) | |
| download | edk2-a115a9efaade48982d7a9545644f75c2f1ccd0e6.zip edk2-a115a9efaade48982d7a9545644f75c2f1ccd0e6.tar.gz edk2-a115a9efaade48982d7a9545644f75c2f1ccd0e6.tar.bz2 | |
MdeModulePkg: Convert HiiDatabaseDxe ConfigRouting ASSERT to return an error
This should just return an error and not assert. We hit this when testing with a client that was trying to access the old IP4_CONFIG on firmware implementing IP4_CONFIG2.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eugene Cohen <eugene@hp.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19219 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index b618903..55ac08c 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -3873,7 +3873,9 @@ HiiConfigRoutingExtractConfig ( &gEfiHiiConfigAccessProtocolGuid,
(VOID **) &ConfigAccess
);
- ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ goto Done;
+ }
Status = ConfigAccess->ExtractConfig (
ConfigAccess,
|