CVS: rdesktop scard.c,1.21,1.22

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

Modified Files:
	scard.c 
Log Message:
Fix two crashes caused by improver handling of structures.


Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** scard.c	20 Feb 2007 16:51:45 -0000	1.21
--- scard.c	28 Jun 2007 12:52:13 -0000	1.22
***************
*** 1269,1272 ****
--- 1269,1273 ----
  	if (!myRsArray)
  		return SC_returnNoMemoryError(&lcHandle, in, out);
+ 	copyReaderState_ServerToMyPCSC(rsArray, myRsArray, readerCount);
  	rv = SCardGetStatusChange((MYPCSC_SCARDCONTEXT) hContext, 0x00000001, myRsArray,
  				  readerCount);
***************
*** 1573,1577 ****
  	if (pioRecvPci)
  	{
! 		copyIORequest_MyPCSCToServer(myPioRecvPci, pioRecvPci);
  	}
  
--- 1574,1583 ----
  	if (pioRecvPci)
  	{
! 		/*
! 		 * pscs-lite mishandles this structure in some cases.
! 		 * make sure we only copy it if it is valid.
! 		 */
! 		if (myPioRecvPci->cbPciLength >= sizeof(MYPCSC_SCARD_IO_REQUEST))
! 			copyIORequest_MyPCSCToServer(myPioRecvPci, pioRecvPci);
  	}
  


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/