EFI_INVALID_PARAMETER should return when the input Block is NULL for ConfigRouting...

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

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 4f83fe386619b1db67ef6f887543c88ae3be444f..7ab6a6e5f0a36e5fd3b4ca949c8c551f36408deb 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -3406,13 +3406,16 @@ HiiConfigToBlock (
 \r
   if (MaxBlockSize > BufferSize) {\r
     *BlockSize = MaxBlockSize;\r
-    if (Block == NULL) {\r
-      return EFI_INVALID_PARAMETER;\r
-    } else {\r
+    if (Block != NULL) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
 \r
+  if (Block == NULL) {\r
+    *Progress = ConfigResp;\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 \r
 Exit:\r