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

[Ludovic Rousseau]

Author: rousseau
Date: 2006-12-25 21:54:20 +0100 (Mon, 25 Dec 2006)
New Revision: 2280

Modified:
   trunk/Drivers/ccid/src/utils.c
Log:
GetNewReaderIndex(): check that Lun is NOT already used

Thanks to Martin Preuss for the idea


Modified: trunk/Drivers/ccid/src/utils.c
===================================================================
--- trunk/Drivers/ccid/src/utils.c	2006-12-25 20:38:50 UTC (rev 2279)
+++ trunk/Drivers/ccid/src/utils.c	2006-12-25 20:54:20 UTC (rev 2280)
@@ -43,7 +43,18 @@
 {
 	int i;
 
+	/* check that Lun is NOT already used */
 	for (i=0; i<CCID_DRIVER_MAX_READERS; i++)
+		if (Lun == ReaderIndex[i])
+			break;
+
+	if (i < CCID_DRIVER_MAX_READERS)
+	{
+		DEBUG_CRITICAL2("Lun: %d is already used", Lun);
+		return -1;
+	}
+
+	for (i=0; i<CCID_DRIVER_MAX_READERS; i++)
 		if (-1 == ReaderIndex[i])
 		{
 			ReaderIndex[i] = Lun;