From b2c0d6a7f39942f3e63db4e60158382a1f974858 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sat, 16 May 2015 10:08:00 +0000
Subject: [PATCH] [PING] Don't mess up with the stack nor leak resources

svn path=/trunk/; revision=67760
---
 reactos/base/applications/network/ping/ping.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/reactos/base/applications/network/ping/ping.c b/reactos/base/applications/network/ping/ping.c
index 7b8bc6ec2cc..c09c079eb82 100644
--- a/reactos/base/applications/network/ping/ping.c
+++ b/reactos/base/applications/network/ping/ping.c
@@ -127,28 +127,34 @@ void FormatOutput(UINT uID, ...)
     UINT DataLength;
     int AnsiLength;
 
-    va_start(valist, uID);
-
     if (!LoadString(GetModuleHandle(NULL), uID,
                     Format, sizeof(Format) / sizeof(WCHAR)))
     {
         return;
     }
 
+    va_start(valist, uID);
+
     DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING, Format, 0, 0, Buf,\
                   sizeof(Buf) / sizeof(WCHAR), &valist);
 
     if(!DataLength)
     {
         if(GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+        {
+            va_end(valist);
             return;
+        }
 
         DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING |\
                                     FORMAT_MESSAGE_ALLOCATE_BUFFER,\
                                     Format, 0, 0, (LPWSTR)&pBuf, 0, &valist);
+    }
 
-        if(!DataLength)
-            return;
+    if(!DataLength)
+    {
+        va_end(valist);
+        return;
     }
 
     if(GetFileType(hStdOutput) == FILE_TYPE_CHAR)