[GNUnet-SVN] r37975 - gnunet/src/cadet

[gnunet]

Author: grothoff
Date: 2016-09-22 13:49:55 +0200 (Thu, 22 Sep 2016)
New Revision: 37975

Modified:
   gnunet/src/cadet/gnunet-service-cadet_peer.c
Log:
-fix use after free

Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c        2016-09-22 11:47:37 UTC 
(rev 37974)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c        2016-09-22 11:49:55 UTC 
(rev 37975)
@@ -1281,11 +1281,6 @@
     GNUNET_CORE_disconnecT (core_handle);
         core_handle = NULL;
   }
-  if (NULL != ats_ch)
-  {
-    GNUNET_ATS_connectivity_done (ats_ch);
-    ats_ch = NULL;
-  }
   GNUNET_PEER_change_rc (myid, -1);
   /* With MQ API, CORE calls the disconnect handler for every peer
    * after calling GNUNET_CORE_disconnecT, shutdown must occur *after* that.
@@ -1293,6 +1288,11 @@
   GNUNET_CONTAINER_multipeermap_iterate (peers,
                                          &shutdown_peer,
                                          NULL);
+  if (NULL != ats_ch)
+  {
+    GNUNET_ATS_connectivity_done (ats_ch);
+    ats_ch = NULL;
+  }
   GNUNET_CONTAINER_multipeermap_destroy (peers);
   peers = NULL;
 }