2 files changed, 11 insertions, 5 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Print.c b/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
index 941d0958f..eeadf2494 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Print.c
@@ -15,7 +15,7 @@ type:
   '%' - Print a %
 
 
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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
@@ -152,9 +152,12 @@ ConsolePrint (
   )
 {
   VA_LIST Args;
+  UINTN   LengthOfPrinted;
 
   VA_START (Args, Fmt);
-  return PrintInternal ((UINTN) -1, (UINTN) -1, gST->ConOut, Fmt, Args);
+  LengthOfPrinted = PrintInternal ((UINTN) -1, (UINTN) -1, gST->ConOut, Fmt, Args);
+  VA_END (Args);
+  return LengthOfPrinted;
 }
 
 
@@ -216,9 +219,12 @@ PrintAt (
   )
 {
   VA_LIST Args;
+  UINTN   LengthOfPrinted;
 
   VA_START (Args, Fmt);
-  return PrintInternal (Column, Row, gST->ConOut, Fmt, Args);
+  LengthOfPrinted = PrintInternal (Column, Row, gST->ConOut, Fmt, Args);
+  VA_END (Args);
+  return LengthOfPrinted;
 }
 
 
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 7c6a032f8..1c3a7f6ba 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -852,8 +852,6 @@ CreateDialog (
   ASSERT (TempString);
   ASSERT (BufferedString);
 
-  VA_START (Marker, KeyValue);
-
   //
   // Zero the outgoing buffer
   //
@@ -875,6 +873,8 @@ CreateDialog (
 
   LargestString = 0;
 
+  VA_START (Marker, KeyValue);
+
   //
   // Determine the largest string in the dialog box
   // Notice we are starting with 1 since String is the first string