[GNUnet-SVN] r19798 - gnunet/src/testing

[gnunet]

Author: bartpolot
Date: 2012-02-14 11:35:31 +0100 (Tue, 14 Feb 2012)
New Revision: 19798

Modified:
   gnunet/src/testing/testing_peergroup.c
Log:
- fix for access of freed meter after ctrl-c

Modified: gnunet/src/testing/testing_peergroup.c
===================================================================
--- gnunet/src/testing/testing_peergroup.c      2012-02-13 17:15:52 UTC (rev 
19797)
+++ gnunet/src/testing/testing_peergroup.c      2012-02-14 10:35:31 UTC (rev 
19798)
@@ -463,6 +463,16 @@
   }
 }
 
+
+/**
+ * Callback called for each started daemon.
+ *
+ * @param cls Clause (PG Context).
+ * @param id PeerIdentidy of started daemon.
+ * @param cfg Configuration used by the daemon.
+ * @param d Handle for the daemon.
+ * @param emsg Error message, NULL on success.
+ */
 static void
 internal_peers_started_callback (void *cls,
                                  const struct GNUNET_PeerIdentity *id,
@@ -488,6 +498,11 @@
 
   pg_start_ctx->peers_left--;
 
+  if (NULL == pg_start_ctx->peer_start_meter)
+  {
+    /* Cancelled Ctrl-C or error */
+    return;
+  }
   if (GNUNET_YES == update_meter (pg_start_ctx->peer_start_meter))
   {
 #if VERBOSE