Reviewed-by: Eric Dong <eric.d...@intel.com> Checked in code at r19219 Thanks, Eric
-----Original Message----- From: Cohen, Eugene [mailto:eug...@hp.com] Sent: Friday, December 04, 2015 9:33 PM To: edk2-devel@lists.01.org; Dong, Eric; Gao, Liming Subject: [PATCH] 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 <eug...@hp.com> --- MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index b618903..9037924 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, -- 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel