[GNUnet-SVN] r30769 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-11-18 15:34:11 +0100 (Mon, 18 Nov 2013)
New Revision: 30769

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
Log:
- fix use after free on shutdown (#3112)


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-18 13:18:49 UTC 
(rev 30768)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-18 14:34:11 UTC 
(rev 30769)
@@ -2077,6 +2077,7 @@
 GMC_shutdown (void)
 {
   GNUNET_CONTAINER_multihashmap_destroy (connections);
+  connections = NULL;
 }
 
 
@@ -2145,6 +2146,10 @@
     GNUNET_SCHEDULER_cancel (c->fwd_maintenance_task);
   if (GNUNET_SCHEDULER_NO_TASK != c->bck_maintenance_task)
     GNUNET_SCHEDULER_cancel (c->bck_maintenance_task);
+  if (GNUNET_SCHEDULER_NO_TASK != c->fwd_fc.poll_task)
+    GNUNET_SCHEDULER_cancel (c->fwd_fc.poll_task);
+  if (GNUNET_SCHEDULER_NO_TASK != c->bck_fc.poll_task)
+    GNUNET_SCHEDULER_cancel (c->bck_fc.poll_task);
 
   /* Unregister from neighbors */
   unregister_neighbors (c);