[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34699 - gnunet/src/social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34699 - gnunet/src/social |
Date: |
Fri, 19 Dec 2014 22:47:34 +0100 |
Author: grothoff
Date: 2014-12-19 22:47:34 +0100 (Fri, 19 Dec 2014)
New Revision: 34699
Modified:
gnunet/src/social/gnunet-service-social.c
gnunet/src/social/social_api.c
gnunet/src/social/test_social.c
Log:
-fix leaks
Modified: gnunet/src/social/gnunet-service-social.c
===================================================================
--- gnunet/src/social/gnunet-service-social.c 2014-12-19 21:39:11 UTC (rev
34698)
+++ gnunet/src/social/gnunet-service-social.c 2014-12-19 21:47:34 UTC (rev
34699)
@@ -690,6 +690,7 @@
sizeof (*req), relay_size, join_msg_size, req_size);
GNUNET_break (0);
GNUNET_SERVER_client_disconnect (client);
+ GNUNET_free (gst);
return;
}
if (0 < gst->relay_count)
@@ -707,12 +708,12 @@
if (NULL == plc_gst)
{
plc_gst = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
- GNUNET_CONTAINER_multihashmap_put (place_guests, &plc->pub_key_hash,
plc_gst,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ (void) GNUNET_CONTAINER_multihashmap_put (place_guests,
&plc->pub_key_hash, plc_gst,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
}
- GNUNET_CONTAINER_multihashmap_put (plc_gst, &gst->pub_key_hash, plc,
+ (void) GNUNET_CONTAINER_multihashmap_put (plc_gst, &gst->pub_key_hash, gst,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
- GNUNET_CONTAINER_multihashmap_put (guests, &plc->pub_key_hash, plc,
+ (void) GNUNET_CONTAINER_multihashmap_put (guests, &plc->pub_key_hash, gst,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
gst->slave
= GNUNET_PSYC_slave_join (cfg, &plc->pub_key, &gst->priv_key,
Modified: gnunet/src/social/social_api.c
===================================================================
--- gnunet/src/social/social_api.c 2014-12-19 21:39:11 UTC (rev 34698)
+++ gnunet/src/social/social_api.c 2014-12-19 21:47:34 UTC (rev 34699)
@@ -661,10 +661,11 @@
struct GNUNET_ENV_Environment *env = NULL;
const void *data = NULL;
uint16_t data_size = 0;
-
+ char *str;
const struct GNUNET_PSYC_JoinRequestMessage *
req = (const struct GNUNET_PSYC_JoinRequestMessage *) msg;
const struct GNUNET_PSYC_Message *entry_msg = NULL;
+
if (sizeof (*req) + sizeof (*entry_msg) <= ntohs (req->header.size))
{
entry_msg = (struct GNUNET_PSYC_Message *) &req[1];
@@ -676,10 +677,12 @@
if (GNUNET_OK != GNUNET_PSYC_message_parse (entry_msg, &method_name, env,
&data, &data_size))
{
+ GNUNET_break_op (0);
+ str = GNUNET_CRYPTO_ecdsa_public_key_to_string (&req->slave_key);
LOG (GNUNET_ERROR_TYPE_WARNING,
"Ignoring invalid entry request from nym %s.\n",
- GNUNET_CRYPTO_ecdsa_public_key_to_string (&req->slave_key));
- GNUNET_break_op (0);
+ str);
+ GNUNET_free (str);
GNUNET_ENV_environment_destroy (env);
return;
}
Modified: gnunet/src/social/test_social.c
===================================================================
--- gnunet/src/social/test_social.c 2014-12-19 21:39:11 UTC (rev 34698)
+++ gnunet/src/social/test_social.c 2014-12-19 21:47:34 UTC (rev 34699)
@@ -293,12 +293,14 @@
struct GNUNET_ENV_Modifier *variables)
{
// FIXME: this function is not called yet
+ struct GNUNET_CRYPTO_EcdsaPublicKey *nym_key = GNUNET_SOCIAL_nym_get_key
(nym);
+ char *str;
- struct GNUNET_CRYPTO_EcdsaPublicKey *
- nym_key = GNUNET_SOCIAL_nym_get_key (nym);
+ str = GNUNET_CRYPTO_ecdsa_public_key_to_string (nym_key);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Nym %s has left the place.\n",
- GNUNET_CRYPTO_ecdsa_public_key_to_string (nym_key));
+ str);
+ GNUNET_free (str);
GNUNET_assert (0 == memcmp (&guest_pub_key, nym_key, sizeof (*nym_key)));
GNUNET_SCHEDULER_add_now (&schedule_host_leave, NULL);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34699 - gnunet/src/social,
gnunet <=