[Pcsclite-cvs-commit] r3037 - /trunk/PCSC/src/winscard_clnt.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Fri Jul 4 08:31:37 UTC 2008
Author: rousseau
Date: Fri Jul 4 08:31:37 2008
New Revision: 3037
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3037
Log:
SCardGetStatusChange(): move check for
cReaders >= PCSCLITE_MAX_READERS_CONTEXTS
Modified:
trunk/PCSC/src/winscard_clnt.c
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=3037&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jul 4 08:31:37 2008
@@ -1742,7 +1742,8 @@
PROFILE_START
- if (rgReaderStates == NULL && cReaders > 0)
+ if ((rgReaderStates == NULL && cReaders > 0)
+ || (cReaders >= PCSCLITE_MAX_READERS_CONTEXTS))
return SCARD_E_INVALID_PARAMETER;
rv = SCardCheckDaemonAvailability();
@@ -1826,12 +1827,6 @@
}
}
}
- else
- if (cReaders >= PCSCLITE_MAX_READERS_CONTEXTS)
- {
- SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
- return SCARD_E_INVALID_VALUE;
- }
/*
* Check the integrity of the reader states structures
More information about the Pcsclite-cvs-commit
mailing list