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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Oct 11 08:15:43 2007
New Revision: 2636

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2636
Log:
RFAddReader(): also count the length of " 00 00" in the reader name
when rejectecting reader names too long

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=2636&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Thu Oct 11 08:15:43 2007
@@ -80,11 +80,11 @@
 	if ((lpcReader == NULL) || (lpcLibrary == NULL) || (lpcDevice == NULL))
 		return SCARD_E_INVALID_VALUE;
 
-	/* Reader name too long? */
-	if (strlen(lpcReader) >= MAX_READERNAME)
+	/* Reader name too long? also count " 00 00"*/
+	if (strlen(lpcReader) > MAX_READERNAME - sizeof(" 00 00"))
 	{
 		Log3(PCSC_LOG_ERROR, "Reader name too long: %d chars instead of max %d",
-			strlen(lpcReader), MAX_READERNAME);
+			strlen(lpcReader), MAX_READERNAME - sizeof(" 00 00"));
 		return SCARD_E_INVALID_VALUE;
 	}