[Pcsclite-cvs-commit] r3018 - /trunk/PCSC/src/winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jun 24 08:31:48 2008
New Revision: 3018

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3018
Log:
SCardListReaderGroups(): check for SCARD_E_INSUFFICIENT_BUFFER only if
mszGroups is non-null

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=3018&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Tue Jun 24 08:31:48 2008
@@ -3296,16 +3296,19 @@
 	{
 		buf = mszGroups;
 
-		if (*pcchGroups < dwGroups)
+		if ((NULL != mszGroups) && (*pcchGroups < dwGroups))
+		{
 			rv = SCARD_E_INSUFFICIENT_BUFFER;
+			goto end;
+		}
 	}
 
 	if (buf)
 		memcpy(buf, ReaderGroup, dwGroups);
 
+end:
 	*pcchGroups = dwGroups;
 
-end:
 	SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
 
 	PROFILE_END(rv)