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

[gnunet]

Author: bartpolot
Date: 2015-10-20 04:28:04 +0200 (Tue, 20 Oct 2015)
New Revision: 36558

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
When cancelling polls cancel pending messages as well, as the message will
trigger a new poll upon sending. Fix #4010.

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-10-18 21:55:21 UTC 
(rev 36557)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2015-10-20 02:28:04 UTC 
(rev 36558)
@@ -3759,6 +3759,11 @@
     GNUNET_SCHEDULER_cancel (fc->poll_task);
     fc->poll_task = NULL;
   }
+  if (NULL != fc->poll_msg)
+  {
+    GCC_cancel (fc->poll_msg);
+    fc->poll_msg = NULL;
+  }
 }