[GNUnet-SVN] r31095 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-12-05 21:51:32 +0100 (Thu, 05 Dec 2013)
New Revision: 31095

Modified:
   gnunet/src/gns/gnunet-bcd.c
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
-fix leaks

Modified: gnunet/src/gns/gnunet-bcd.c
===================================================================
--- gnunet/src/gns/gnunet-bcd.c 2013-12-05 20:45:35 UTC (rev 31094)
+++ gnunet/src/gns/gnunet-bcd.c 2013-12-05 20:51:32 UTC (rev 31095)
@@ -249,6 +249,10 @@
     {
       GNUNET_break (0);
       GNUNET_break (0 == CLOSE (fd));
+      GNUNET_free (deffile);
+      GNUNET_free (p);
+      GNUNET_DISK_directory_remove (tmp);
+      GNUNET_free (tmp);
       return MHD_NO;
     }
     (void) MHD_add_response_header (response,
@@ -258,6 +262,7 @@
                               MHD_HTTP_OK,
                               response);
     MHD_destroy_response (response);
+    GNUNET_free (deffile);
     GNUNET_free (p);
     GNUNET_DISK_directory_remove (tmp);
     GNUNET_free (tmp);

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2013-12-05 20:45:35 UTC (rev 31094)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2013-12-05 20:51:32 UTC (rev 31095)
@@ -813,34 +813,28 @@
 static int
 check_ssl_certificate (struct Socks5Request *s5r)
 {
-  struct curl_tlsinfo tlsinfo;
   unsigned int cert_list_size;
   const gnutls_datum_t *chainp;
-  union {
-    struct curl_tlsinfo *tlsinfo;
-    struct curl_slist   *to_slist;
-  } gptr;
+  const struct curl_tlsinfo *tlsinfo;
   char certdn[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 3];
   size_t size;
   gnutls_x509_crt_t x509_cert;
   int rc;
   const char *name;
 
-  memset (&tlsinfo, 0, sizeof (tlsinfo));
-  gptr.tlsinfo = &tlsinfo;
   if (CURLE_OK !=
       curl_easy_getinfo (s5r->curl,
                         CURLINFO_TLS_SESSION,
-                        &gptr))
+                        &tlsinfo))
     return GNUNET_SYSERR;
-  if (CURLSSLBACKEND_GNUTLS != tlsinfo.ssl_backend)
+  if (CURLSSLBACKEND_GNUTLS != tlsinfo->ssl_backend)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Unsupported CURL SSL backend %d\n"),
-                tlsinfo.ssl_backend);
+                tlsinfo->ssl_backend);
     return GNUNET_SYSERR;
   }
-  chainp = gnutls_certificate_get_peers (tlsinfo.internals, &cert_list_size);
+  chainp = gnutls_certificate_get_peers (tlsinfo->internals, &cert_list_size);
   if ( (! chainp) || (0 == cert_list_size) )
     return GNUNET_SYSERR;