diff options
| author | Star Zeng <star.zeng@intel.com> | 2018-07-28 09:22:03 +0800 |
|---|---|---|
| committer | Kinney, Michael D <michael.d.kinney@intel.com> | 2018-08-02 14:46:19 -0700 |
| commit | ebfac291bd0e57f1ef452fb2f3a402738165bf3b (patch) | |
| tree | 1e45e3a7dd1869ca11892079693edb69ff175b48 | |
| parent | b1be077fa4e1c5fc61ec0df0c9691bd07943406a (diff) | |
| download | edk2-ebfac291bd0e57f1ef452fb2f3a402738165bf3b.tar.gz edk2-ebfac291bd0e57f1ef452fb2f3a402738165bf3b.tar.bz2 edk2-ebfac291bd0e57f1ef452fb2f3a402738165bf3b.zip | |
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>
| -rw-r--r-- | FmpDevicePkg/FmpDxe/FmpDxe.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c b/FmpDevicePkg/FmpDxe/FmpDxe.c index eb45273754..94fdf56085 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxe.c +++ b/FmpDevicePkg/FmpDxe/FmpDxe.c @@ -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:
|