FmpDevicePkg FmpDxe: Check ImageIndex first before Image/ImageSize

It does not make sense to check the Image/ImageSize if ImageIndex
has been invalid.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Star Zeng 2018-07-28 09:22:03 +08:00 committed by Kinney, Michael D
parent b1be077fa4
commit ebfac291bd
1 changed files with 9 additions and 10 deletions

View File

@ -497,6 +497,15 @@ GetTheImage (
Status = EFI_SUCCESS;
//
// Check to make sure index is 1 (only 1 image for this device)
//
if (ImageIndex != 1) {
DEBUG ((DEBUG_ERROR, "FmpDxe: GetImage() - Image Index Invalid.\n"));
Status = EFI_INVALID_PARAMETER;
goto cleanup;
}
if ((ImageSize == NULL)) {
DEBUG ((DEBUG_ERROR, "FmpDxe: GetImage() - ImageSize Pointer Parameter is NULL.\n"));
Status = EFI_INVALID_PARAMETER;
@ -523,16 +532,6 @@ GetTheImage (
goto cleanup;
}
//
// Check to make sure index is 1 (only 1 image for this device)
//
if (ImageIndex != 1) {
DEBUG ((DEBUG_ERROR, "FmpDxe: GetImage() - Image Index Invalid.\n"));
Status = EFI_INVALID_PARAMETER;
goto cleanup;
}
Status = FmpDeviceGetImage (Image, ImageSize);
cleanup: