[Pcsclite-cvs-commit] Drivers/ccid/src commands.c,1.8,1.9

rousseau@quantz.debian.org rousseau@quantz.debian.org
Tue, 27 Jan 2004 15:59:18 +0100


Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory quantz:/tmp/cvs-serv29817

Modified Files:
	commands.c 
Log Message:
in case of error exits CCID_Receive() without copying an nonexistent anwser


Index: commands.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/commands.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- commands.c	15 Jan 2004 14:19:02 -0000	1.8
+++ commands.c	27 Jan 2004 14:59:16 -0000	1.9
@@ -340,7 +340,6 @@
 {
 	unsigned char cmd[10+CMD_BUF_SIZE];	/* CCID + APDU buffer */
 	int length;
-	RESPONSECODE return_value = IFD_SUCCESS;
 
 time_request:
 	length = sizeof(cmd);
@@ -351,7 +350,7 @@
 	{
 		ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__);    /* bError */
 		*rx_length = 0; /* nothing received */
-		return_value = IFD_COMMUNICATION_ERROR;
+		return IFD_COMMUNICATION_ERROR;
 	}
 
 	if (cmd[STATUS_OFFSET] & CCID_TIME_EXTENSION)
@@ -367,7 +366,7 @@
 		length = *rx_length;
 	memcpy(rx_buffer, cmd+10, length);
 
-	return return_value;
+	return IFD_SUCCESS;
 } /* CCID_Receive */