When cancelling polls cancel pending messages as well, as the message will

trigger a new poll upon sending. Fix #4010.

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 26ccabbcd32bd92321c492f00353517e7699523a..2d030f8afc3900670134edaf719a782c2f10305c 100644 (file)
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -3759,6 +3759,11 @@ GCC_stop_poll (struct CadetConnection *c, int fwd)
     GNUNET_SCHEDULER_cancel (fc->poll_task);
     fc->poll_task = NULL;
   }
+  if (NULL != fc->poll_msg)
+  {
+    GCC_cancel (fc->poll_msg);
+    fc->poll_msg = NULL;
+  }
 }