fixes for #2570

4 files changed, 14 insertions, 5 deletions

diff --git a/src/stream/test_stream_2peers_halfclose.c b/src/stream/test_stream_2peers_halfclose.c
index e089a22a1..2d14acfe3 100644
--- a/src/stream/test_stream_2peers_halfclose.c
+++ b/src/stream/test_stream_2peers_halfclose.c
@@ -334,7 +334,10 @@ do_close (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_STREAM_close (peer2.socket);
   if (GNUNET_SCHEDULER_NO_TASK != abort_task)
     GNUNET_SCHEDULER_cancel (abort_task);
-  GNUNET_TESTBED_operation_done (peer2.op);
+  if (NULL != peer2.op)
+    GNUNET_TESTBED_operation_done (peer2.op);
+  else
+    GNUNET_SCHEDULER_shutdown (); /* For shutting down testbed */
 }
 
 
@@ -697,7 +700,10 @@ stream_da (void *cls, void *op_result)
   {
     lsocket = op_result;
     GNUNET_STREAM_listen_close (lsocket);
-    GNUNET_TESTBED_operation_done (peer1.op);
+    if (NULL != peer1.op)
+      GNUNET_TESTBED_operation_done (peer1.op);
+    else
+      GNUNET_SCHEDULER_shutdown ();
     return;
   }
   if (&peer1 == cls)
diff --git a/src/stream/test_stream_big.c b/src/stream/test_stream_big.c
index 35302182a..19c7e571a 100644
--- a/src/stream/test_stream_big.c
+++ b/src/stream/test_stream_big.c
@@ -90,7 +90,8 @@ static int result;
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_STREAM_close (peer1.socket);
+  if (NULL != peer1.socket)
+    GNUNET_STREAM_close (peer1.socket);
   if (NULL != peer2.socket)
     GNUNET_STREAM_close (peer2.socket);
   if (NULL != peer2_listen_socket)
diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c
index af1b8ff84..699bc8032 100644
--- a/src/stream/test_stream_local.c
+++ b/src/stream/test_stream_local.c
@@ -168,7 +168,8 @@ stream_write_task (void *cls,
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_STREAM_close (peer1.socket);
+  if (NULL != peer1.socket)
+    GNUNET_STREAM_close (peer1.socket);
   if (NULL != peer2.socket)
     GNUNET_STREAM_close (peer2.socket);
   if (NULL != peer2_listen_socket)
diff --git a/src/stream/test_stream_sequence_wraparound.c b/src/stream/test_stream_sequence_wraparound.c
index 1e5156fe9..8f35a41d3 100644
--- a/src/stream/test_stream_sequence_wraparound.c
+++ b/src/stream/test_stream_sequence_wraparound.c
@@ -95,7 +95,8 @@ static int result;
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_STREAM_close (peer1.socket);
+  if (NULL != peer1.socket)
+    GNUNET_STREAM_close (peer1.socket);
   if (NULL != peer2.socket)
     GNUNET_STREAM_close (peer2.socket);
   if (NULL != peer2_listen_socket)