[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35044 - gnunet/src/rps
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35044 - gnunet/src/rps |
Date: |
Wed, 28 Jan 2015 20:23:05 +0100 |
Author: bartpolot
Date: 2015-01-28 20:23:04 +0100 (Wed, 28 Jan 2015)
New Revision: 35044
Modified:
gnunet/src/rps/gnunet-service-rps.c
Log:
- fixes for NPE
Modified: gnunet/src/rps/gnunet-service-rps.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps.c 2015-01-28 19:15:55 UTC (rev 35043)
+++ gnunet/src/rps/gnunet-service-rps.c 2015-01-28 19:23:04 UTC (rev 35044)
@@ -1389,7 +1389,8 @@
{
struct PeerContext *peer_ctx;
const struct GNUNET_CADET_Channel *ch = (const struct GNUNET_CADET_Channel
*) cls;
- struct GNUNET_CADET_Channel *destroy;
+ struct GNUNET_CADET_Channel *recv;
+ struct GNUNET_CADET_Channel *send;
peer_ctx = (struct PeerContext *) value;
@@ -1402,25 +1403,27 @@
peer_ctx->is_live_task = NULL;
}
- if (NULL != peer_ctx->send_channel
- && ch != peer_ctx->send_channel)
+ send = peer_ctx->send_channel;
+ peer_ctx->send_channel = NULL;
+ recv = peer_ctx->send_channel;
+ peer_ctx->recv_channel = NULL;
+
+ if (NULL != send
+ && ch != send)
{
- destroy = peer_ctx->send_channel;
- peer_ctx->send_channel = NULL;
- GNUNET_CADET_channel_destroy (destroy);
+ GNUNET_CADET_channel_destroy (send);
}
- if (NULL != peer_ctx->recv_channel
- && ch != peer_ctx->recv_channel)
+ if (NULL != recv
+ && ch != recv)
{
- destroy = peer_ctx->recv_channel;
- peer_ctx->recv_channel = NULL;
- GNUNET_CADET_channel_destroy (destroy);
+ GNUNET_CADET_channel_destroy (recv);
}
if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_remove_all (peer_map, key))
LOG (GNUNET_ERROR_TYPE_WARNING, "removing peer from peer_map failed\n");
+ /* FIXME this will be called twice until the fixme in line 1451 is fixed */
GNUNET_free (peer_ctx);
return GNUNET_YES;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35044 - gnunet/src/rps,
gnunet <=