Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 09:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a small bug after me, and check if it really got memmory or not.

Browse source 
svn path=/trunk/; revision=17627
This commit is contained in:
Magnus Olsen 2005-09-04 09:29:44 +00:00
parent 25f28a6291
commit 1cb2b6830e
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
reactos/subsys/system/cmd/start.c
View file

@ -21,8 +21,8 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
{
TCHAR szFullName[MAX_PATH];
TCHAR first[CMDLINE_LENGTH];
TCHAR *rest;
TCHAR *param;
TCHAR *rest = NULL;
TCHAR *param = NULL;
BOOL bWait = FALSE;
BOOL bBat = FALSE;
BOOL bCreate = FALSE;
@ -30,10 +30,7 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
PROCESS_INFORMATION prci;
STARTUPINFO stui;
param[0] = _T('\0');
if (_tcsncmp (Rest, _T("/?"), 2) == 0)
{
@ -50,6 +47,22 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
}
rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR));
if (rest == NULL)
{
error_out_of_memory();
return 1;
}
param =malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR));
if (rest == NULL)
{
free(rest);
error_out_of_memory();
return 1;
}
param[0] = _T('\0');
_tcscpy(rest,Rest);
@ -63,8 +76,8 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
for(i = 0; i < count; i++)
{
if(rest[i] == _T(' '))
{
param = malloc ( _tcslen(&rest[i]) + 1 * sizeof(TCHAR));
{
_tcscpy(param,&rest[i]);
rest[i] = _T('\0');
break;
@ -83,7 +96,7 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
if(rest[i] == _T('\"'))
bInside = !bInside;
if((rest[i] == _T(' ')) && !bInside)
{
{
_tcscpy(param,&rest[i]);
rest[i] = _T('\0');
break;
@ -134,6 +147,7 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
if (param != NULL)
free(param);
return 1;
}
@ -148,6 +162,7 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
if (!SearchForExecutable (_T("CMD"), szFullCmdLine))
{
error_bad_command ();
if (rest != NULL)
free(rest);
@ -179,8 +194,9 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
if (bBat == FALSE)
{
_tcscpy (szFullCmdLine, first);
if( param )
if( param != NULL )
{
_tcscat(szFullCmdLine, _T(" ") );
_tcscat (szFullCmdLine, param);
}
@ -224,7 +240,7 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
ErrorMessage(GetLastError (),
_T("Error executing CreateProcess()!!\n"));
}
// }
if (rest != NULL)
free(rest);