Changeset 1085 for trunk

Timestamp:

12/19/08 20:45:15 (3 years ago)

Author:

alonbl

Message:

Fix memory leak in OpenCT/src/ifd/ifd-cyberjack.c

By Ludovic Rousseau with some modifications.

http://www.opensc-project.org/pipermail/opensc-devel/2008-December/011502.html

File:

• trunk/src/ifd/ifd-cyberjack.c (modified) (8 diffs)

trunk/src/ifd/ifd-cyberjack.c

@@ -368 +368 @@
     ifd_device_t * const dev = reader->device;
         int ret;
-        struct cyberjack_t1_state *state;
+        int result = -1;
+        struct cyberjack_t1_state *state = NULL;
   
         cyberjack_ifd_debug(1, 40, "called (dev = 0x%x).", reader->device);
@@ -380 +381 @@
         state = calloc( 1, sizeof(struct cyberjack_t1_state) );
         if( state == NULL )
-                return -1;
+                goto cleanup;
                 
         state->dev = dev;
@@ -388 +389 @@
         {
                 cyberjack_ct_error(80, "cyberjack: failed to activate 1");
-                return -1;
+                goto cleanup;
         }
         
@@ -394 +395 @@
         if( (ret=cyberjack_recv_t1( state, 0xe2, read_buffer ))!=4 || memcmp( read_buffer, "\x2e\xe0\x00\xce", 4 )!=0 )  {
                 cyberjack_ct_error(80, "cyberjack: failed to activate 2: no cookie");
-                return -1;
+                goto cleanup;
         }
 
@@ -400 +401 @@
         if( cyberjack_send_t1( state, "\x12\x00\x04" "\x20\x11\x00\x00", 7 ) != 7 )  {
                 cyberjack_ct_error(80, "cyberjack: failed to activate 5");              
-                return -1;
+                goto cleanup;
         }
         ret = cyberjack_recv_t1( state, 0x12, read_buffer );
         if( ret < 0 )  {
                 cyberjack_ct_error(80, "cyberjack: failed to activate 5.1");            
-                return -1;
+                goto cleanup;
         }
         cyberjack_ifd_debug(1, 80+ret*3, "cyberjack: t1 response is : %s", 
@@ -411 +412 @@
         if( ret < 6 )  {
                 cyberjack_ifd_debug(1, 80, "cyberjack: response is short 6.1");
-                return -1;
+                goto cleanup;
         }
         if( ret != 6 || read_buffer[3]!=0x90 || read_buffer[4]!=0 )
@@ -419 +420 @@
                 // could neever recover from this
                 cyberjack_ct_error(80, "cyberjack: failed to activate: failed to reset the reader");            
-                return -1;
+                goto cleanup;
         }
 
@@ -432 +433 @@
         if( ret < 3 || memcmp(read_buffer, "\x2e\xe0\x00", 3 )!=0 )  {
                 cyberjack_ct_error(80, "cyberjack: failed to activate 7.1");            
-                return -1;
+                goto cleanup;
         }
         
         reader->driver_data = state;
-        
-        cyberjack_init_proto( reader, state );
-        
-        cyberjack_ifd_debug(1, 80, "cyberjack: activated OK, ns=%d", state->ns);
-        
-        return 0;
+        state = NULL;
+        
+        cyberjack_init_proto( reader, (struct cyberjack_t1_state *)reader->driver_data );
+        
+        cyberjack_ifd_debug(1, 80, "cyberjack: activated OK, ns=%d",
+                ((struct cyberjack_t1_state *)reader->driver_data)->ns);
+        
+        result = 0;
+
+cleanup:
+        if (state != NULL) {
+                free(state);
+        }
+
+        return result;
 }