Changeset 2fb1262

Timestamp:

2012-11-11T18:22:39Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dd672e2

Parents:

1388d30

Message:

Tiny cleanup. Fixing some memory leaks (why did I not notice so far that
those free()s were commented out?).

Files:

• lib/ssl_gnutls.c (modified) (8 diffs)
• protocols/twitter/twitter_lib.c (modified) (3 diffs)

lib/ssl_gnutls.c

@@ -38 +38 @@
 
 static gboolean initialized = FALSE;
-gnutls_certificate_credentials xcred;
+gnutls_certificate_credentials_t xcred;
 
 #include <limits.h>
@@ -60 +60 @@
         gboolean verify;
         
-        gnutls_session session;
+        gnutls_session_t session;
 };
 
@@ -132 +132 @@
         conn->data = data;
         conn->inpa = -1;
-        conn->hostname = hostname;
+        conn->hostname = g_strdup( hostname );
         
         /* For now, SSL verification is globally enabled by setting the cafile
@@ -169 +169 @@
         int verifyret = 0;
         gnutls_x509_crt_t cert;
-        const char *hostname;
-        
-        hostname = gnutls_session_get_ptr( session );
+        struct scd *conn;
+        
+        conn = gnutls_session_get_ptr( session );
 
         gnutlsret = gnutls_certificate_verify_peers2( session, &status );
@@ -209 +209 @@
                 return VERIFY_CERT_ERROR;
 
-        if( !gnutls_x509_crt_check_hostname( cert, hostname ) )
+        if( !gnutls_x509_crt_check_hostname( cert, conn->hostname ) )
         {
                 verifyret |= VERIFY_CERT_INVALID;
@@ -265 +265 @@
         
         gnutls_init( &conn->session, GNUTLS_CLIENT );
-        if( conn->verify )
-                gnutls_session_set_ptr( conn->session, (void *) conn->hostname );
+        gnutls_session_set_ptr( conn->session, (void *) conn );
 #if GNUTLS_VERSION_NUMBER < 0x020c00
         gnutls_transport_set_lowat( conn->session, 0 );
@@ -274 +273 @@
         
         sock_make_nonblocking( conn->fd );
-        gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) GNUTLS_STUPID_CAST conn->fd );
+        gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr_t) GNUTLS_STUPID_CAST conn->fd );
         
         return ssl_handshake( data, source, cond );
@@ -400 +399 @@
         if( conn->session )
                 gnutls_deinit( conn->session );
+        g_free( conn->hostname );
         g_free( conn );
 }

protocols/twitter/twitter_lib.c

@@ -958 +958 @@
 
         g_free(args[1]);
-        if (td->timeline_id) {
-                g_free(args[5]);
-        }
+        g_free(args[5]);
 }
 
@@ -986 +984 @@
                 goto end;
         twitter_xt_get_status_list(ic, parsed, txl);
-//      json_value_free(parsed);
+        json_value_free(parsed);
 
         td->home_timeline_obj = txl;
@@ -1022 +1020 @@
                 goto end;
         twitter_xt_get_status_list(ic, parsed, txl);
-//      json_value_free(parsed);
+        json_value_free(parsed);
 
         td->mentions_obj = txl;