Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTVDM]

Browse source 
Correctly NULL-terminate the command-lines when needed (and avoid buffer overruns).

svn path=/trunk/; revision=63365
This commit is contained in:
Hermès Bélusca-Maïto 2014-05-18 23:45:43 +00:00
parent 3e159aa702
commit 65a58c440e
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsystems/ntvdm/dos/dem.c
View file

@ -119,8 +119,8 @@ static VOID WINAPI DosCmdInterpreterBop(LPWORD Stack)
STARTUPINFOA StartupInfo;
PROCESS_INFORMATION ProcessInformation;
/* NULL-terminate the command by removing the return carriage character */
while (*CmdPtr != '\r') CmdPtr++;
/* NULL-terminate the command line by removing the return carriage character */
while (*CmdPtr && *CmdPtr != '\r') CmdPtr++;
*CmdPtr = '\0';
DPRINT1("CMD Run Command '%s'\n", Command);

4
reactos/subsystems/ntvdm/dos/dos32krnl/dos.c
View file

@ -926,6 +926,10 @@ DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType,
return ERROR_NOT_SUPPORTED;
}
/* NULL-terminate the command line by removing the return carriage character */
while (*CommandLine && *CommandLine != '\r') CommandLine++;
*(LPSTR)CommandLine = '\0';
/* Open a handle to the executable */
FileHandle = CreateFileA(ExecutablePath,
GENERIC_READ,