[GNUnet-SVN] r38042 - gnunet/src/rps

[gnunet]

Author: ch3
Date: 2016-09-30 01:46:25 +0200 (Fri, 30 Sep 2016)
New Revision: 38042

Modified:
   gnunet/src/rps/gnunet-service-rps.c
Log:
-fix rps service: prevent calling _request_cancel() twice

Modified: gnunet/src/rps/gnunet-service-rps.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps.c 2016-09-29 23:46:22 UTC (rev 38041)
+++ gnunet/src/rps/gnunet-service-rps.c 2016-09-29 23:46:25 UTC (rev 38042)
@@ -926,7 +926,10 @@
 
   cli_ctx = rep_cls->cli_ctx;
   GNUNET_assert (NULL != cli_ctx);
-  RPS_sampler_request_cancel (rep_cls->req_handle);
+  if (NULL != rep_cls->req_handle)
+  {
+    RPS_sampler_request_cancel (rep_cls->req_handle);
+  }
   GNUNET_CONTAINER_DLL_remove (cli_ctx->rep_cls_head,
                                cli_ctx->rep_cls_tail,
                                rep_cls);
@@ -1035,6 +1038,7 @@
 
   cli_ctx = reply_cls->cli_ctx;
   GNUNET_assert (NULL != cli_ctx);
+  reply_cls->req_handle = NULL;
   destroy_reply_cls (reply_cls);
   GNUNET_MQ_send (cli_ctx->mq, ev);
 }