[Pcsclite-cvs-commit] r2290 - trunk/Drivers/ccid/src

[Ludovic Rousseau]

Author: rousseau
Date: 2007-01-02 15:28:08 +0100 (Tue, 02 Jan 2007)
New Revision: 2290

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
WriteUSB()/ReadUSB(): check that the device entry is still valid before
using it


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2007-01-02 14:25:30 UTC (rev 2289)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2007-01-02 14:28:08 UTC (rev 2290)
@@ -458,6 +458,9 @@
 	int rv;
 	char debug_header[] = "-> 121234 ";
 
+	if (usbDevice[reader_index].dev == NULL)
+		return STATUS_UNSUCCESSFUL;
+
 	sprintf(debug_header, "-> %06X ", (int)reader_index);
 
 	DEBUG_XXD(debug_header, buffer, length);
@@ -502,6 +505,9 @@
 	char debug_header[] = "<- 121234 ";
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
 
+	if (usbDevice[reader_index].dev == NULL)
+		return STATUS_UNSUCCESSFUL;
+
 read_again:
 	sprintf(debug_header, "<- %06X ", (int)reader_index);