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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Mar 16 17:35:54 2011
New Revision: 5659

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5659
Log:
CardControl(): initialize all the fields of the struct control_struct to
avoid valgrind warning:

==14600== Syscall param socketcall.sendto(msg) points to uninitialised byte(s)
==14600==    at 0x5042532: send (send.c:28)
==14600==    by 0x4E2FDF9: MessageSend (winscard_msg.c:355)
==14600==    by 0x4E2FEE2: MessageSendWithHeader (winscard_msg.c:294)
==14600==    by 0x4E2C05C: SCardControl (winscard_clnt.c:2375)
==14600==    by 0x4008D4: main (scontrol.c:49)
==14600==  Address 0x7fefffc60 is on thread 1's stack


Thanks to Martin Vogt for the bug report
http://archives.neohapsis.com/archives/dev/muscle/2011-q1/0088.html

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=5659&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Wed Mar 16 17:35:54 2011
@@ -2371,6 +2371,8 @@
 	scControlStruct.dwControlCode = dwControlCode;
 	scControlStruct.cbSendLength = cbSendLength;
 	scControlStruct.cbRecvLength = cbRecvLength;
+	scControlStruct.dwBytesReturned = 0;
+	scControlStruct.rv = 0;
 
 	rv = MessageSendWithHeader(SCARD_CONTROL, currentContextMap->dwClientID,
 		sizeof(scControlStruct), &scControlStruct);