[gnunet] branch master updated: -fix unchecked remove calls in messenger ego store

[gnunet]

This is an automated email from the git hooks/post-receive script.

thejackimonster pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 2bee6f88f -fix unchecked remove calls in messenger ego store
2bee6f88f is described below

commit 2bee6f88f4754bc9317ff12334220e2bc6cfe5a2
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Thu May 5 15:00:12 2022 +0200

    -fix unchecked remove calls in messenger ego store
    
    Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 src/messenger/gnunet-service-messenger_ego_store.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/messenger/gnunet-service-messenger_ego_store.c 
b/src/messenger/gnunet-service-messenger_ego_store.c
index 8f40a924b..60a4d7bfc 100644
--- a/src/messenger/gnunet-service-messenger_ego_store.c
+++ b/src/messenger/gnunet-service-messenger_ego_store.c
@@ -200,13 +200,17 @@ bind_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
 {
   GNUNET_assert ((store) && (identifier) && (handle));
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Store bind ego: %s\n", identifier);
+
   struct GNUNET_HashCode hash;
   GNUNET_CRYPTO_hash (identifier, strlen (identifier), &hash);
 
   if (GNUNET_YES == 
GNUNET_CONTAINER_multihashmap_contains_value(store->handles, &hash, handle))
     return;
 
-  GNUNET_CONTAINER_multihashmap_put(store->handles, &hash, handle, 
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(store->handles, &hash, 
handle,
+                                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE))
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Putting handle binding to ego store 
failed!\n");
 }
 
 void
@@ -216,13 +220,16 @@ unbind_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
 {
   GNUNET_assert ((store) && (identifier) && (handle));
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Store unbind ego: %s\n", identifier);
+
   struct GNUNET_HashCode hash;
   GNUNET_CRYPTO_hash (identifier, strlen (identifier), &hash);
 
   if (GNUNET_YES != 
GNUNET_CONTAINER_multihashmap_contains_value(store->handles, &hash, handle))
     return;
 
-  GNUNET_CONTAINER_multihashmap_remove(store->handles, &hash, handle);
+  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove(store->handles, 
&hash, handle))
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Removing handle binding from ego 
store failed!\n");
 }
 
 static void
@@ -342,10 +349,13 @@ delete_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
     return;
   }
 
-  GNUNET_CONTAINER_multihashmap_remove (store->egos, &hash, ego);
-  GNUNET_free(ego);
-
+  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (store->egos, &hash, 
ego))
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Removing ego from store failed!\n");
+    return;
+  }
 
+  GNUNET_free(ego);
 }
 
 static void

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.