Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-12 06:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some incorrect lengths in ConInString (Bug 4085); also make sure result is nul-terminated.

Browse source 
svn path=/trunk/; revision=40303
This commit is contained in:
Jeffrey Morlan 2009-03-31 04:06:47 +00:00
parent ae5067a1ab
commit dcf22e1daf
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/base/shell/cmd/console.c
View file

@ -88,15 +88,14 @@ VOID ConInKey (PINPUT_RECORD lpBuffer)
VOID ConInString (LPTSTR lpInput, DWORD dwLength)
{
DWORD dwOldMode;
DWORD dwRead;
DWORD dwRead = 0;
HANDLE hFile;
LPTSTR p;
DWORD i;
PCHAR pBuf;
#ifdef _UNICODE
pBuf = (PCHAR)cmd_alloc(dwLength);
pBuf = (PCHAR)cmd_alloc(dwLength - 1);
#else
pBuf = lpInput;
#endif
@ -106,13 +105,13 @@ VOID ConInString (LPTSTR lpInput, DWORD dwLength)
SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL);
ReadFile (hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL);
#ifdef _UNICODE
MultiByteToWideChar( InputCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1);
MultiByteToWideChar(InputCodePage, 0, pBuf, dwRead, lpInput, dwLength - 1);
cmd_free(pBuf);
#endif
p = lpInput;
for (i = 0; i < dwRead; i++, p++)
for (p = lpInput; *p; p++)
{
if (*p == _T('\x0d'))
{
@ -121,10 +120,6 @@ VOID ConInString (LPTSTR lpInput, DWORD dwLength)
}
}
#ifdef _UNICODE
cmd_free(pBuf);
#endif
SetConsoleMode (hFile, dwOldMode);
}