[gnunet] branch master updated (cc11671bf -> 10a1edb89)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from cc11671bf TRANSPORT: fix contains_address.
     new cd0e76422 transport: only create one statistics handle in tcp 
communicator.
     new 870f335b9 transport: manually destroy d_mq if not yet registered.
     new b642e2b14 transport: fix mq_init memory leak in already-exists case.
     new 10a1edb89 cadet: fix memory leak in announce_id in 
gnunet-service-cadet.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/service/cadet/gnunet-service-cadet_dht.c    | 1 +
 src/service/transport/gnunet-communicator-tcp.c | 4 +++-
 src/service/transport/gnunet-communicator-udp.c | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/service/cadet/gnunet-service-cadet_dht.c 
b/src/service/cadet/gnunet-service-cadet_dht.c
index 28b5448fd..dcd1efaa2 100644
--- a/src/service/cadet/gnunet-service-cadet_dht.c
+++ b/src/service/cadet/gnunet-service-cadet_dht.c
@@ -217,6 +217,7 @@ announce_id (void *cls)
                   expiration,  /* Data expiration */
                   NULL,         /* Continuation */
                   NULL);        /* Continuation closure */
+  GNUNET_free (block);
 }
 
 
diff --git a/src/service/transport/gnunet-communicator-tcp.c 
b/src/service/transport/gnunet-communicator-tcp.c
index 02a547335..f8ea14cc7 100644
--- a/src/service/transport/gnunet-communicator-tcp.c
+++ b/src/service/transport/gnunet-communicator-tcp.c
@@ -3349,6 +3349,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity 
*peer, const char *address)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Queue for %s already exists or is in construction\n", 
address);
+    GNUNET_free (in);
     return GNUNET_NO;
   }
   switch (in->sa_family)
@@ -3799,7 +3800,8 @@ init_socket (struct sockaddr *addr,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Bound to `%s'\n",
               GNUNET_a2s ((const struct sockaddr *) &in_sto, sto_len));
-  stats = GNUNET_STATISTICS_create ("communicator-tcp", cfg);
+  if (NULL == stats)
+    stats = GNUNET_STATISTICS_create ("communicator-tcp", cfg);
 
   if (NULL == is)
     is = GNUNET_NT_scanner_init ();
diff --git a/src/service/transport/gnunet-communicator-udp.c 
b/src/service/transport/gnunet-communicator-udp.c
index e9496c571..1e6e5bdc3 100644
--- a/src/service/transport/gnunet-communicator-udp.c
+++ b/src/service/transport/gnunet-communicator-udp.c
@@ -909,6 +909,11 @@ receiver_destroy (struct ReceiverAddress *receiver)
     GNUNET_TRANSPORT_communicator_mq_del (receiver->d_qh);
     receiver->d_qh = NULL;
   }
+  else if (NULL != receiver->d_mq)
+  {
+    GNUNET_MQ_destroy (receiver->d_mq);
+    receiver->d_mq = NULL;
+  }
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multihashmap_remove (receivers,
                                                        &receiver->key,
@@ -2892,6 +2897,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity 
*peer, const char *address)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "receiver %s already exist or is being connected to\n",
                 address);
+    GNUNET_free (in);
     return GNUNET_NO;
   }
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.