- Fix reading past the end of the pool block.

reactos/subsys/win32k/ntuser

diff -u -r1.26 -r1.27
--- keyboard.c	11 Mar 2004 16:17:25 -0000	1.26
+++ keyboard.c	15 Mar 2004 19:06:35 -0000	1.27
@@ -16,7 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-/* $Id: keyboard.c,v 1.26 2004/03/11 16:17:25 weiden Exp $

+/* $Id: keyboard.c,v 1.27 2004/03/15 19:06:35 dwelch Exp $

  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel

@@ -541,9 +541,10 @@

 
 	RtlFreeUnicodeString(&LayoutFile);
 

-	KeyboardLayoutWSTR = ExAllocatePoolWithTag(PagedPool,
-						   (FullLayoutPath.Length + 1) * 
-						   sizeof(WCHAR), TAG_STRING);

+	KeyboardLayoutWSTR = 
+	  ExAllocatePoolWithTag(PagedPool,
+				FullLayoutPath.Length + sizeof(WCHAR), 
+				TAG_STRING);

 
 	if( !KeyboardLayoutWSTR ) {
 	  DPRINT1("Couldn't allocate a string for the keyboard layout name.\n");

@@ -551,8 +552,8 @@

 	  return;
 	}
 	memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer,

-	       (FullLayoutPath.Length + 1) * sizeof(WCHAR));
-	KeyboardLayoutWSTR[FullLayoutPath.Length] = 0;

+	       FullLayoutPath.Length + sizeof(WCHAR));
+	KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0;

 
 	kbModule = EngLoadImage(KeyboardLayoutWSTR);
 	DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR );