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

[Ludovic Rousseau]

Author: rousseau
Date: 2006-01-17 19:57:11 +0000 (Tue, 17 Jan 2006)
New Revision: 1804

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
OpenUSBByName(): check that usbDevice[previous_reader_index].dev is
still valid before dereferencing it

Thanks to Martin Paljak for the bug report


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2006-01-17 19:49:49 UTC (rev 1803)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2006-01-17 19:57:11 UTC (rev 1804)
@@ -305,6 +305,7 @@
 					if (already_used)
 					{
 						if ((previous_reader_index != -1)
+							&& usbDevice[previous_reader_index].dev
 							&& (strcmp(usbDevice[previous_reader_index].dev->bus->dirname, bus->dirname)  == 0)
 							&& (strcmp(usbDevice[previous_reader_index].dev->filename, dev->filename) == 0)
 							&& usbDevice[previous_reader_index].ccid.bCurrentSlotIndex < usbDevice[previous_reader_index].ccid.bMaxSlotIndex)