[GNUnet-SVN] r36619 - gnunet/src/testbed

[gnunet]

Author: grothoff
Date: 2015-10-29 11:26:34 +0100 (Thu, 29 Oct 2015)
New Revision: 36619

Modified:
   gnunet/src/testbed/testbed_api_testbed.c
Log:
-do not segv on controller crash

Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c    2015-10-29 10:00:14 UTC (rev 
36618)
+++ gnunet/src/testbed/testbed_api_testbed.c    2015-10-29 10:26:34 UTC (rev 
36619)
@@ -624,12 +624,14 @@
   rc->interrupt_task = GNUNET_SCHEDULER_add_delayed
       (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, rc);
   rc_cleanup_operations (rc);
-  if ( (GNUNET_NO == rc->shutdown)
-       && (NULL != c)
-       && (0 != (size = GNUNET_CONTAINER_multihashmap32_size (c->opc_map))))
+  if ( (GNUNET_NO == rc->shutdown) &&
+       (NULL != c) &&
+       (NULL != c->opc_map) &&
+       (0 != (size = GNUNET_CONTAINER_multihashmap32_size (c->opc_map))))
   {
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Shutdown postponed as there are "
-         "%u operations currently active\n", size);
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "Shutdown postponed as there are %u operations currently active\n",
+         size);
     c->opcq_empty_cb = &wait_op_completion;
     c->opcq_empty_cls = rc;
     return;