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

[Ludovic Rousseau]

Author: rousseau
Date: 2006-08-01 20:05:22 +0000 (Tue, 01 Aug 2006)
New Revision: 2119

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
ReadUSB(): check that usbDevice[reader_index].dev->bus is still non-NULL
(as we do in WriteUSB()) before dereferencing it in the debug message.

Thanks to Michael Wegner for the patch


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2006-08-01 07:13:50 UTC (rev 2118)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2006-08-01 20:05:22 UTC (rev 2119)
@@ -505,9 +505,15 @@
 	if (rv < 0)
 	{
 		*length = 0;
-		DEBUG_CRITICAL4("usb_bulk_read(%s/%s): %s",
-			usbDevice[reader_index].dev->bus->dirname,
-			usbDevice[reader_index].dev->filename, strerror(errno));
+		if (usbDevice[reader_index].dev->bus)
+		{
+			DEBUG_CRITICAL4("usb_bulk_read(%s/%s): %s",
+					usbDevice[reader_index].dev->bus->dirname,
+					usbDevice[reader_index].dev->filename, strerror(errno));
+		}
+		else
+			DEBUG_CRITICAL2("usb_bulk_read(no device): %s", strerror(errno));
+
 		return STATUS_UNSUCCESSFUL;
 	}