[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 04/05: shutdown might happen when plc_gst is not i
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 04/05: shutdown might happen when plc_gst is not in the hashmap |
Date: |
Sun, 07 Jan 2018 01:00:25 +0100 |
This is an automated email from the git hooks/post-receive script.
lurchi pushed a commit to branch master
in repository gnunet.
commit 1522c35f31166008edec5a3ac341d80626792e42
Author: lurchi <address@hidden>
AuthorDate: Sun Jan 7 00:59:40 2018 +0100
shutdown might happen when plc_gst is not in the hashmap
---
src/social/gnunet-service-social.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/social/gnunet-service-social.c
b/src/social/gnunet-service-social.c
index d1e644812..520df20b9 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -503,17 +503,18 @@ cleanup_guest (struct Guest *gst)
struct GNUNET_CONTAINER_MultiHashMap *
plc_gst = GNUNET_CONTAINER_multihashmap_get (place_guests,
&plc->pub_key_hash);
- GNUNET_assert (NULL != plc_gst);
- GNUNET_CONTAINER_multihashmap_remove (plc_gst, &plc->ego_pub_hash, gst);
-
- if (0 == GNUNET_CONTAINER_multihashmap_size (plc_gst))
+ if (NULL != plc_gst)
{
- GNUNET_CONTAINER_multihashmap_remove (place_guests, &plc->pub_key_hash,
- plc_gst);
- GNUNET_CONTAINER_multihashmap_destroy (plc_gst);
+ GNUNET_CONTAINER_multihashmap_remove (plc_gst, &plc->ego_pub_hash, gst);
+
+ if (0 == GNUNET_CONTAINER_multihashmap_size (plc_gst))
+ {
+ GNUNET_CONTAINER_multihashmap_remove (place_guests, &plc->pub_key_hash,
+ plc_gst);
+ GNUNET_CONTAINER_multihashmap_destroy (plc_gst);
+ }
}
GNUNET_CONTAINER_multihashmap_remove (guests, &plc->pub_key_hash, gst);
-
if (NULL != gst->join_req)
GNUNET_free (gst->join_req);
if (NULL != gst->relays)
@@ -1869,6 +1870,7 @@ guest_enter (const struct GuestEnterRequest *greq, struct
Guest **ret_gst)
ret = GNUNET_YES;
}
+ // TODO: explain why free(gst) not necessary
if (NULL != ret_gst)
*ret_gst = gst;
return ret;
--
To stop receiving notification emails like this one, please contact
address@hidden