From 3b440449ddde76f6aa842026c5102f28e243f2f2 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Wed, 6 Jul 2005 13:09:23 +0000
Subject: [PATCH]  Add proper memory alloc ProcessInput, the error handling for
 memory handling need to be improve

svn path=/trunk/; revision=16453
---
 reactos/subsys/system/cmd/cmd.c | 41 +++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index a659b973535..dccbcc1a170 100644
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -137,6 +137,8 @@
  *
  *    06-jul-2005 (Magnus Olsen <magnus@greatlord.com>)
  *        translate '%errorlevel%' to the internal value.
+ *        Add proper memmory alloc ProcessInput, the error 
+ *        handling for memmory handling need to be improve
  */
 
 #include "precomp.h"
@@ -983,30 +985,51 @@ ProcessInput (BOOL bFlag)
 						if ((tp != NULL) &&
 						    (tp <= _tcschr(ip, _T(' ')) - 1))
 						{
-							TCHAR evar[512];
+              INT size = 512;
+							TCHAR *evar;
 							*tp = _T('\0');
-            
-							/* FIXME: This is just a quick hack!! */
-							/* Do a proper memory allocation!! */                                 
-                          
+
+              /* FIXME: Correct error handling when it can not alloc memmory */
+              evar = malloc ( size * sizeof(TCHAR));
+              if (evar==NULL) 
+                  return 1; 
+            							            
               if (_tcsicmp(ip,_T("errorlevel")) ==0)
               {       
                 memset(evar,0,512 * sizeof(TCHAR));
                 _itot(nErrorLevel,evar,10);        
                 cp = _stpcpy (cp, evar);
-              } 
-							else if (GetEnvironmentVariable (ip, evar, 512))
+              }               
+							else 
               {
+                size = GetEnvironmentVariable (ip, evar, size);
+                if (size!=0)
+                {
+                    evar = realloc(evar,size * sizeof(TCHAR) );
+                    if (evar!=NULL)
+                    {
+                      size = GetEnvironmentVariable (ip, evar, size);
+                    }
+                }
+
+                if (size)
+                {
 								 cp = _stpcpy (cp, evar);
+                }
               }
-              
+
+              if (evar!=NULL)
+              {
+                free(evar);
+              } 
 							ip = tp + 1;
+
 						}
 						else
 						{
 							*cp++ = _T('%');
 						}              
-             
+           
 						break;
 				}
 				continue;