]> git.proxmox.com Git - mirror_edk2.git/commitdiff
MdeModulePkg:Avoid ASSERT in HiiConfigRoutingRouteConfig
authorDandan Bi <dandan.bi@intel.com>
Wed, 6 Jan 2016 00:52:53 +0000 (00:52 +0000)
committerdandanbi <dandanbi@Edk2>
Wed, 6 Jan 2016 00:52:53 +0000 (00:52 +0000)
Add error handling code to enhance the code,the driver may not install
the ConfigAccess protocol,so should not just ASSERT here.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19590 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c

index 55ac08cedb29859a7b55858f8bf18e7b2f0c388e..8f0b96847dd184379564f639fb1cb62617b38cfd 100644 (file)
@@ -4346,7 +4346,11 @@ HiiConfigRoutingRouteConfig (
                       &gEfiHiiConfigAccessProtocolGuid,\r
                       (VOID **)  &ConfigAccess\r
                       );\r
-      ASSERT_EFI_ERROR (Status);\r
+      if (EFI_ERROR (Status)) {\r
+        *Progress = StringPtr;\r
+        FreePool (ConfigResp);\r
+        return EFI_NOT_FOUND;\r
+      }\r
 \r
       Status = ConfigAccess->RouteConfig (\r
                                ConfigAccess,\r