Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix a buffer overflow in cmd

Browse source 
- Make "CMD /C" clean up before exiting to get rid of spurious "memory leak" debug messages

svn path=/trunk/; revision=40248
This commit is contained in:
Jeffrey Morlan 2009-03-26 06:31:46 +00:00
parent 9285de53cd
commit 8b1901148f
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -335,7 +335,7 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
need rewrite some code to use cmd_realloc when it need instead need rewrite some code to use cmd_realloc when it need instead
of add 512bytes extra */ of add 512bytes extra */
first = cmd_alloc ( (_tcslen(First) + 512) * sizeof(TCHAR)); first = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR));
if (first == NULL) if (first == NULL)
{ {
error_out_of_memory(); error_out_of_memory();
@ -343,7 +343,7 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
return FALSE; return FALSE;
} }
rest = cmd_alloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); rest = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR));
if (rest == NULL) if (rest == NULL)
{ {
cmd_free (first); cmd_free (first);
@ -1540,7 +1540,7 @@ ProcessInput()
{ {
PARSED_COMMAND *Cmd; PARSED_COMMAND *Cmd;
do while (!bCanExit || !bExit)
{ {
Cmd = ParseCommand(NULL); Cmd = ParseCommand(NULL);
if (!Cmd) if (!Cmd)
@ -1549,7 +1549,6 @@ ProcessInput()
ExecuteCommand(Cmd); ExecuteCommand(Cmd);
FreeCommand(Cmd); FreeCommand(Cmd);
} }
while (!bCanExit || !bExit);
return nErrorLevel; return nErrorLevel;
} }
@ -1891,7 +1890,7 @@ Initialize()
GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip);
ParseCommandLine(commandline); ParseCommandLine(commandline);
if (option != _T('K')) if (option != _T('K'))
cmd_exit(nErrorLevel); bExit = TRUE;
} }
} }