CVS: rdesktop seamless.c,1.1.2.4,1.1.2.5

Peter Åstrand <[email protected]>
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14159

Modified Files:
      Tag: seamlessrdp-branch
	seamless.c 
Log Message:
Always call strtol with zero base, to be tolerant

Index: seamless.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/Attic/seamless.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** seamless.c	10 Mar 2006 12:44:32 -0000	1.1.2.4
--- seamless.c	10 Mar 2006 13:34:41 -0000	1.1.2.5
***************
*** 87,99 ****
  			return False;
  
! 		id = strtol(tok2, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		parent = strtol(tok3, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok4, &endptr, 16);
  		if (*endptr)
  			return False;
--- 87,99 ----
  			return False;
  
! 		id = strtol(tok2, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		parent = strtol(tok3, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok4, &endptr, 0);
  		if (*endptr)
  			return False;
***************
*** 106,114 ****
  			return False;
  
! 		id = strtol(tok2, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok3, &endptr, 16);
  		if (*endptr)
  			return False;
--- 106,114 ----
  			return False;
  
! 		id = strtol(tok2, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok3, &endptr, 0);
  		if (*endptr)
  			return False;
***************
*** 128,150 ****
  			return False;
  
! 		id = strtol(tok2, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		x = strtol(tok3, &endptr, 10);
  		if (*endptr)
  			return False;
! 		y = strtol(tok4, &endptr, 10);
  		if (*endptr)
  			return False;
  
! 		width = strtol(tok5, &endptr, 10);
  		if (*endptr)
  			return False;
! 		height = strtol(tok6, &endptr, 10);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok7, &endptr, 16);
  		if (*endptr)
  			return False;
--- 128,150 ----
  			return False;
  
! 		id = strtol(tok2, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		x = strtol(tok3, &endptr, 0);
  		if (*endptr)
  			return False;
! 		y = strtol(tok4, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		width = strtol(tok5, &endptr, 0);
  		if (*endptr)
  			return False;
! 		height = strtol(tok6, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok7, &endptr, 0);
  		if (*endptr)
  			return False;
***************
*** 161,169 ****
  			return False;
  
! 		id = strtol(tok2, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok4, &endptr, 16);
  		if (*endptr)
  			return False;
--- 161,169 ----
  			return False;
  
! 		id = strtol(tok2, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok4, &endptr, 0);
  		if (*endptr)
  			return False;
***************
*** 178,190 ****
  			return False;
  
! 		id = strtol(tok2, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		state = strtol(tok3, &endptr, 16);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok4, &endptr, 16);
  		if (*endptr)
  			return False;
--- 178,190 ----
  			return False;
  
! 		id = strtol(tok2, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		state = strtol(tok3, &endptr, 0);
  		if (*endptr)
  			return False;
  
! 		flags = strtol(tok4, &endptr, 0);
  		if (*endptr)
  			return False;



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.