[Pcsclite-cvs-commit] r6356 - /trunk/PCSC/src/readerfactory.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Jun 25 13:38:46 2012
New Revision: 6356

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6356
Log:
RFReaderInfoNamePort(): Compare only the significant part of the reader name

Since revision 6354 the reader name may be truncated. Only the part in
readerState->readerName (managed by RFAddReader()) is truntacted. The
reader name stored the hotplug_*.c readerTracker[] structures is NOT
truncated. So we must use a truncated compare function to find the
reader name.

Modified:
    trunk/PCSC/src/readerfactory.c

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=6356&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Mon Jun 25 13:38:46 2012
@@ -700,8 +700,9 @@
 			tmplen = strlen(lpcStripReader);
 			lpcStripReader[tmplen - 6] = 0;
 
-			if ((strcmp(readerName, lpcStripReader) == 0) &&
-				(port == sReadersContexts[i]->port))
+			/* Compare only the significant part of the reader name */
+			if ((strncmp(readerName, lpcStripReader, MAX_READERNAME - sizeof(" 00 00")) == 0)
+				&& (port == sReadersContexts[i]->port))
 			{
 				*sReader = sReadersContexts[i];
 				return SCARD_S_SUCCESS;