MdeModulePkg/HiiDatabase: Handle questions with Bit VarStore

[mirror_edk2.git] / MdeModulePkg / Universal / HiiDatabaseDxe / ImageEx.c

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c
index 1e3f3bd1c87ce2f8db7294dfae5add83d964fe7b..33dbc7d5d5ab8a954083a8d2fae5f702f140c410 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c
@@ -361,6 +361,10 @@ HiiGetImageInfo (
   // Find the image block specified by ImageId\r
   //\r
   CurrentImageBlock = GetImageIdOrAddress (ImagePackage->ImageBlock, &ImageId);\r
+  if (CurrentImageBlock == NULL) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   switch (CurrentImageBlock->BlockType) {\r
   case EFI_HII_IIBT_IMAGE_JPEG:\r
   case EFI_HII_IIBT_IMAGE_PNG:\r