Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 00:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

- implement GrowIfNecessary_dbg() using file and line from the caller to cmd_alloc_dbg memory.

Browse source 
- fix memory allocation size, respecting the terminating 0
See issue #2845 for more details.

svn path=/trunk/; revision=30800
This commit is contained in:
Timo Kreuzer 2007-11-27 00:28:40 +00:00
parent 4ade767c50
commit 209a4eb72e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/base/shell/cmd/cmd.c
View file

@ -1116,18 +1116,20 @@ VOID ParseCommandLine (LPTSTR cmd)
}
BOOL
GrowIfNecessary ( UINT needed, LPTSTR* ret, UINT* retlen )
GrowIfNecessary_dbg ( UINT needed, LPTSTR* ret, UINT* retlen, const char *file, int line )
{
if ( *ret && needed < *retlen )
return TRUE;
*retlen = needed;
if ( *ret )
cmd_free ( *ret );
*ret = (LPTSTR)cmd_alloc ( *retlen * sizeof(TCHAR) );
// *ret = (LPTSTR)cmd_alloc ( *retlen * sizeof(TCHAR) );
*ret = (LPTSTR)cmd_alloc_dbg ( *retlen * sizeof(TCHAR), file, line );
if ( !*ret )
SetLastError ( ERROR_OUTOFMEMORY );
return *ret != NULL;
}
#define GrowIfNecessary(x, y, z) GrowIfNecessary_dbg(x, y, z, __FILE__, __LINE__)
LPCTSTR
GetEnvVarOrSpecial ( LPCTSTR varName )
@ -1222,7 +1224,7 @@ GetEnvVarOrSpecial ( LPCTSTR varName )
return ret;
}
GrowIfNecessary(_tcslen(varName) + 2, &ret, &retlen);
GrowIfNecessary(_tcslen(varName) + 3, &ret, &retlen);
_stprintf(ret,_T("%%%s%%"),varName);
return ret; /* not found - return orginal string */
}