[GNUnet-SVN] r31749 - gnunet/src/set

[gnunet]

Author: dold
Date: 2013-12-25 16:42:48 +0100 (Wed, 25 Dec 2013)
New Revision: 31749

Modified:
   gnunet/src/set/gnunet-service-set.c
Log:
make sure incoming request is not destroyed twice

Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-12-25 11:20:38 UTC (rev 31748)
+++ gnunet/src/set/gnunet-service-set.c 2013-12-25 15:42:48 UTC (rev 31749)
@@ -452,6 +452,12 @@
     GNUNET_SCHEDULER_cancel (incoming->state->timeout_task);
     incoming->state->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
+  GNUNET_assert (NULL != incoming->state);
+  GNUNET_free (incoming->state);
+  // make sure that the tunnel end handler will not
+  // destroy us again
+  incoming->vt = NULL;
+  incoming->state = NULL;
   if (NULL != incoming->mq)
   {
     GNUNET_MQ_destroy (incoming->mq);
@@ -462,12 +468,6 @@
     GNUNET_MESH_channel_destroy (incoming->channel);
     incoming->channel = NULL;
   }
-  GNUNET_assert (NULL != incoming->state);
-  GNUNET_free (incoming->state);
-  // make sure that the tunnel end handler will not
-  // destroy us again
-  incoming->vt = NULL;
-  incoming->state = NULL;
 }