[Box Backup-commit] COMMIT r1137 - box/trunk/lib/win32

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-27 20:28:35 +0100 (Fri, 27 Oct 2006)
New Revision: 1137

Modified:
   box/trunk/lib/win32/emu.cpp
Log:
Changed WideSize from int to size_t.

Don't allow space for null terminator that will not be added.


Modified: box/trunk/lib/win32/emu.cpp
===================================================================
--- box/trunk/lib/win32/emu.cpp	2006-10-27 19:28:05 UTC (rev 1136)
+++ box/trunk/lib/win32/emu.cpp	2006-10-27 19:28:35 UTC (rev 1137)
@@ -1559,7 +1559,7 @@
 		return -1;
 	}
 
-	int WideSize = BufferSize / 5;
+	size_t WideSize = BufferSize / 5;
 	WCHAR* pWideBuffer = new WCHAR [WideSize];
 
 	if (!pWideBuffer)
@@ -1573,7 +1573,7 @@
 	if (!ReadConsoleW(
 			hConsole,
 			pWideBuffer,
-			WideSize - 1,
+			WideSize, // will not be null terminated by ReadConsole
 			&numCharsRead,
 			NULL // reserved
 		))