From 3bbe68a3627e7c75474955352f27b923c5831ad7 Mon Sep 17 00:00:00 2001
From: rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 1 Feb 2012 06:06:08 +0000
Subject: Add Missing invocations to VA_END() for VA_START().

Signed-off-by: rsun3
Reviewed-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12979 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c | 8 ++------
 Nt32Pkg/Sec/SecMain.c                          | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'Nt32Pkg')

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
index 2028c606a..67d88c650 100644
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -1,6 +1,6 @@
 /**@file
 
-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -950,14 +950,10 @@ Returns:
     //
     // Check input parameters
     //
-    if (NumOfLba == 0) {
+    if (NumOfLba == 0 || (StartingLba + NumOfLba) > NumOfBlocks) {
       VA_END (args);
       return EFI_INVALID_PARAMETER;
     }
-
-    if ((StartingLba + NumOfLba) > NumOfBlocks) {
-      return EFI_INVALID_PARAMETER;
-    }
   } while (1);
 
   VA_END (args);
diff --git a/Nt32Pkg/Sec/SecMain.c b/Nt32Pkg/Sec/SecMain.c
index 0c859a265..a1d43d2eb 100644
--- a/Nt32Pkg/Sec/SecMain.c
+++ b/Nt32Pkg/Sec/SecMain.c
@@ -1,6 +1,6 @@
 /**@file
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -123,6 +123,8 @@ SecPrint (
   
   _vsnprintf (Buffer, sizeof (Buffer), Format, Marker);
 
+  va_end (Marker);
+
   CharCount = strlen (Buffer);
   WriteFile (
     GetStdHandle (STD_OUTPUT_HANDLE), 
-- 
cgit v1.2.3