Add Missing invocations to VA_END() for VA_START().

[mirror_edk2.git] / EmulatorPkg / FvbServicesRuntimeDxe / FWBlockService.c

diff --git a/EmulatorPkg/FvbServicesRuntimeDxe/FWBlockService.c b/EmulatorPkg/FvbServicesRuntimeDxe/FWBlockService.c
index 9513d05bed594774c9c89948efc5999e6b19460e..44df1172b12d57e81dc81db5d6cf43b2e0b63251 100644 (file)
--- a/EmulatorPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -1,6 +1,6 @@
 /*++ @file\r
 \r
 /*++ @file\r
 \r

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r

 Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -911,14 +911,10 @@ Returns:
     //\r
     // Check input parameters\r
     //\r
     //\r
     // Check input parameters\r
     //\r

-    if (NumOfLba == 0) {\r
+    if (NumOfLba == 0 || (StartingLba + NumOfLba) > NumOfBlocks) {\r

       VA_END (args);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
       VA_END (args);\r
       return EFI_INVALID_PARAMETER;\r
     }\r

-\r
-    if ((StartingLba + NumOfLba) > NumOfBlocks) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r

   } while (1);\r
 \r
   VA_END (args);\r
   } while (1);\r
 \r
   VA_END (args);\r