[GNUnet-SVN] r10350 - gnunet/src/topology

[gnunet]

Author: grothoff
Date: 2010-02-17 15:42:56 +0100 (Wed, 17 Feb 2010)
New Revision: 10350

Modified:
   gnunet/src/topology/gnunet-daemon-topology.c
Log:
leaks

Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c        2010-02-17 14:39:10 UTC 
(rev 10349)
+++ gnunet/src/topology/gnunet-daemon-topology.c        2010-02-17 14:42:56 UTC 
(rev 10350)
@@ -507,6 +507,9 @@
    if (pos->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
      GNUNET_SCHEDULER_cancel (sched,
                              pos->hello_delay_task);
+   GNUNET_free_non_null (pos->hello);   
+   if (pos->filter != NULL)
+     GNUNET_CONTAINER_bloomfilter_free (peer->filter);
    GNUNET_free (pos);
 }
 
@@ -841,7 +844,6 @@
   if (peer == NULL)
     peer = make_peer (&pid, hello, GNUNET_NO);
   // FIXME: check if 'hello' is any different from peer->hello?
-  GNUNET_free_non_null (peer->hello);
 #if DEBUG_TOPOLOGY
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Found `%s' from peer `%s' for advertising\n",
@@ -849,6 +851,7 @@
              GNUNET_i2s (&pid));
 #endif 
   size = GNUNET_HELLO_size (hello);
+  GNUNET_free_non_null (peer->hello);
   peer->hello = GNUNET_malloc (size);
   memcpy (peer->hello, hello, size);
   if (peer->filter != NULL)