[Pcsclite-cvs-commit] r6810 - trunk/PCSC/src
ludovic.rousseau at free.fr
ludovic.rousseau at free.fr
Fri Dec 20 10:19:01 UTC 2013
Author: rousseau
Date: 2013-12-20 10:19:01 +0000 (Fri, 20 Dec 2013)
New Revision: 6810
Modified:
trunk/PCSC/src/winscard_clnt.c
Log:
SCardListReaders(): fix a memory leak in case of error
Check mszReaders is valid before allocating memory.
Thanks to Ignacio Casal for the bug report
http://archives.neohapsis.com/archives/dev/muscle/2013-q4/0084.html
Modified: trunk/PCSC/src/winscard_clnt.c
===================================================================
--- trunk/PCSC/src/winscard_clnt.c 2013-12-17 08:57:30 UTC (rev 6809)
+++ trunk/PCSC/src/winscard_clnt.c 2013-12-20 10:19:01 UTC (rev 6810)
@@ -2960,17 +2960,17 @@
if (SCARD_AUTOALLOCATE == *pcchReaders)
{
+ if (NULL == mszReaders)
+ {
+ rv = SCARD_E_INVALID_PARAMETER;
+ goto end;
+ }
buf = malloc(dwReadersLen);
if (NULL == buf)
{
rv = SCARD_E_NO_MEMORY;
goto end;
}
- if (NULL == mszReaders)
- {
- rv = SCARD_E_INVALID_PARAMETER;
- goto end;
- }
*(char **)mszReaders = buf;
}
else
More information about the Pcsclite-cvs-commit
mailing list