CVS: rdesktop rdesktop.c,1.139,1.140 secure.c,1.53,1.54 xkeymap.c,1.87,1.88

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2930

Modified Files:
	rdesktop.c secure.c xkeymap.c 
Log Message:
Applied patch #1367109: prevent strtol overflow

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** rdesktop.c	31 Aug 2005 13:00:57 -0000	1.139
--- rdesktop.c	30 Dec 2005 20:32:06 -0000	1.140
***************
*** 52,56 ****
  char g_hostname[16];
  char g_keymapname[PATH_MAX] = "";
! int g_keylayout = 0x409;	/* Defaults to US keyboard layout */
  int g_keyboard_type = 0x4;	/* Defaults to US keyboard layout */
  int g_keyboard_subtype = 0x0;	/* Defaults to US keyboard layout */
--- 52,56 ----
  char g_hostname[16];
  char g_keymapname[PATH_MAX] = "";
! unsigned int g_keylayout = 0x409;	/* Defaults to US keyboard layout */
  int g_keyboard_type = 0x4;	/* Defaults to US keyboard layout */
  int g_keyboard_subtype = 0x0;	/* Defaults to US keyboard layout */

Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** secure.c	8 Aug 2005 19:15:56 -0000	1.53
--- secure.c	30 Dec 2005 20:32:06 -0000	1.54
***************
*** 30,34 ****
  extern int g_width;
  extern int g_height;
! extern int g_keylayout;
  extern int g_keyboard_type;
  extern int g_keyboard_subtype;
--- 30,34 ----
  extern int g_width;
  extern int g_height;
! extern unsigned int g_keylayout;
  extern int g_keyboard_type;
  extern int g_keyboard_subtype;

Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** xkeymap.c	31 Aug 2005 13:00:57 -0000	1.87
--- xkeymap.c	30 Dec 2005 20:32:06 -0000	1.88
***************
*** 42,46 ****
  extern Window g_wnd;
  extern char g_keymapname[16];
! extern int g_keylayout;
  extern int g_keyboard_type;
  extern int g_keyboard_subtype;
--- 42,46 ----
  extern Window g_wnd;
  extern char g_keymapname[16];
! extern unsigned int g_keylayout;
  extern int g_keyboard_type;
  extern int g_keyboard_subtype;
***************
*** 322,326 ****
  		if (str_startswith(line, "map "))
  		{
! 			g_keylayout = strtol(line + sizeof("map ") - 1, NULL, 16);
  			DEBUG_KBD(("Keylayout 0x%x\n", g_keylayout));
  			continue;
--- 322,326 ----
  		if (str_startswith(line, "map "))
  		{
! 			g_keylayout = strtoul(line + sizeof("map ") - 1, NULL, 16);
  			DEBUG_KBD(("Keylayout 0x%x\n", g_keylayout));
  			continue;



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click