MdeModulePkg/LogoDxe: Return error if HII Package not present

[mirror_edk2.git] / MdeModulePkg / Logo / Logo.c

diff --git a/MdeModulePkg/Logo/Logo.c b/MdeModulePkg/Logo/Logo.c
index f0792addd3a9d8e9cffccaab90dd3af1d4c377ec..1789ad9d90bc8c4ab53b1da3d0826b9db065a659 100644 (file)
--- a/MdeModulePkg/Logo/Logo.c
+++ b/MdeModulePkg/Logo/Logo.c
@@ -1,7 +1,7 @@
 /** @file\r
   Logo DXE Driver, install Edkii Platform Logo protocol.\r
 \r
-Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -69,7 +69,7 @@ GetImage (
   }\r
 \r
   Current = *Instance;\r
-  if (Current >= sizeof (mLogos) / sizeof (mLogos[0])) {\r
+  if (Current >= ARRAY_SIZE (mLogos)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -133,7 +133,10 @@ InitializeLogo (
                   NULL,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
-  ASSERT_EFI_ERROR (Status);\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "HII Image Package with logo not found in PE/COFF resource section\n"));\r
+    return Status;\r
+  }\r
 \r
   //\r
   // Publish HII package list to HII Database.\r