Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 05:55:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add proper memory alloc ProcessInput, the error handling for memory handling need to be improve

Browse source 
svn path=/trunk/; revision=16453
This commit is contained in:
Magnus Olsen 2005-07-06 13:09:23 +00:00
parent 04480b3be7
commit 3b440449dd
1 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
reactos/subsys/system/cmd/cmd.c
View file

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