[gnunet] branch master updated (88905793d -> b486f61c6)

[gnunet]

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

t3sserakt pushed a change to branch master
in repository gnunet.

    from 88905793d UTIL: Fix tests ftbfs for new blinding API
     new 2b87bab14 Peerstore: Fixed memory related bugs.
     new a71b24585 Testing: Exchange binary name for transport in test case 
configuration.
     new 7da79377a Transport: Fixed null pointer in address iteration code to 
start validation.
     new b486f61c6 Merge branch 'master' of ssh://git.gnunet.org/gnunet

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/service/core/test_core_just_run.conf             | 2 +-
 src/service/core/test_core_just_run_host.conf        | 2 +-
 src/service/hostlist/gnunet-daemon-hostlist_client.c | 3 +++
 src/service/peerstore/peerstore_api.c                | 5 ++++-
 src/service/topology/gnunet-daemon-topology.c        | 3 +++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/service/core/test_core_just_run.conf 
b/src/service/core/test_core_just_run.conf
index 7ea8686a1..287824c61 100644
--- a/src/service/core/test_core_just_run.conf
+++ b/src/service/core/test_core_just_run.conf
@@ -3,7 +3,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
-BINARY = gnunet-service-tng
+BINARY = gnunet-service-transport
 #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes 
--log-file=$GNUNET_TEST_HOME/vg_peer1-%p 
 UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock
 
diff --git a/src/service/core/test_core_just_run_host.conf 
b/src/service/core/test_core_just_run_host.conf
index 045ed5940..406b8dcc9 100644
--- a/src/service/core/test_core_just_run_host.conf
+++ b/src/service/core/test_core_just_run_host.conf
@@ -3,7 +3,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
-BINARY = gnunet-service-tng
+BINARY = gnunet-service-transport
 #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes 
--log-file=$GNUNET_TEST_HOME/vg_peer1-%p 
 UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock
 
diff --git a/src/service/hostlist/gnunet-daemon-hostlist_client.c 
b/src/service/hostlist/gnunet-daemon-hostlist_client.c
index 5a61e62c2..bedc52612 100644
--- a/src/service/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/service/hostlist/gnunet-daemon-hostlist_client.c
@@ -332,6 +332,7 @@ shc_cont (void *cls, int success)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Error storing hostlist entry!\n");
   GNUNET_CONTAINER_DLL_remove (shc_head, shc_tail, shc_cls->shc);
+  GNUNET_free (shc_cls);
 }
 
 
@@ -423,6 +424,8 @@ callback_download (void *ptr, size_t size, size_t nmemb, 
void *ctx)
       shc_cls->shc = shc;
       GNUNET_CONTAINER_DLL_insert (shc_head, shc_tail, shc);
     }
+    else
+      GNUNET_free (shc_cls);
     memmove (download_buffer, &download_buffer[msize], download_pos - msize);
     download_pos -= msize;
   }
diff --git a/src/service/peerstore/peerstore_api.c 
b/src/service/peerstore/peerstore_api.c
index d5cb091f9..e627e1e82 100644
--- a/src/service/peerstore/peerstore_api.c
+++ b/src/service/peerstore/peerstore_api.c
@@ -1150,6 +1150,7 @@ merge_success (void *cls, int success)
   struct StoreHelloCls *shu_cls = cls;
   struct GNUNET_PEERSTORE_StoreHelloContext *huc = shu_cls->huc;
 
+  GNUNET_CONTAINER_multipeermap_remove (huc->store_context_map, huc->pid, 
shu_cls->sc);
   if (GNUNET_OK != success)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -1158,9 +1159,9 @@ merge_success (void *cls, int success)
     GNUNET_free (huc->hello);
     GNUNET_free (huc->pid);
     GNUNET_free (huc);
+    GNUNET_free (shu_cls);
     return;
   }
-  GNUNET_CONTAINER_multipeermap_remove (huc->store_context_map, huc->pid, 
shu_cls->sc);
   if (0 == GNUNET_CONTAINER_multipeermap_size (huc->store_context_map))
   {
     GNUNET_PEERSTORE_watch_cancel (huc->wc);
@@ -1173,11 +1174,13 @@ merge_success (void *cls, int success)
     GNUNET_free (huc->hello);
     GNUNET_free (huc->pid);
     GNUNET_free (huc);
+    GNUNET_free (shu_cls);
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Got notified during storing hello uri for peer %s!\n",
               GNUNET_i2s (huc->pid));
+  GNUNET_free (shu_cls);
 }
 
 
diff --git a/src/service/topology/gnunet-daemon-topology.c 
b/src/service/topology/gnunet-daemon-topology.c
index 19bd29563..587f564dd 100644
--- a/src/service/topology/gnunet-daemon-topology.c
+++ b/src/service/topology/gnunet-daemon-topology.c
@@ -852,6 +852,7 @@ shc_cont (void *cls, int success)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Error storing hello!\n");
   GNUNET_CONTAINER_DLL_remove (shc_head, shc_tail, shc_cls->shc);
+  GNUNET_free (shc_cls);
 }
 
 
@@ -886,6 +887,8 @@ handle_hello (void *cls, const struct GNUNET_MessageHeader 
*message)
     shc_cls->shc = shc;
     GNUNET_CONTAINER_DLL_insert (shc_head, shc_tail, shc);
   }
+  else
+    GNUNET_free (shc_cls);
   GNUNET_HELLO_builder_free (builder);
 }
 

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