[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30246 - gnunet/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30246 - gnunet/src/namestore |
Date: |
Thu, 17 Oct 2013 10:01:38 +0200 |
Author: grothoff
Date: 2013-10-17 10:01:38 +0200 (Thu, 17 Oct 2013)
New Revision: 30246
Modified:
gnunet/src/namestore/gnunet-service-namestore.c
gnunet/src/namestore/test_namestore_api_store.c
gnunet/src/namestore/test_namestore_api_store_update.c
Log:
-fix use after free, cancel of dead task
Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c 2013-10-17 07:48:25 UTC
(rev 30245)
+++ gnunet/src/namestore/gnunet-service-namestore.c 2013-10-17 08:01:38 UTC
(rev 30246)
@@ -526,6 +526,7 @@
{
struct GNUNET_GNSRECORD_Block *block;
struct CacheOperation *cop;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
if (0 == rd_count)
block = GNUNET_GNSRECORD_block_create (zone_key,
@@ -538,8 +539,12 @@
rd),
name,
rd, rd_count);
+ GNUNET_CRYPTO_ecdsa_key_get_public (zone_key,
+ &pkey);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Caching block in namecache\n");
+ "Caching block for label `%s' in zone `%s' in namecache\n",
+ name,
+ GNUNET_GNSRECORD_z2s (&pkey));
cop = GNUNET_new (struct CacheOperation);
cop->client = client;
cop->rid = rid;
@@ -675,7 +680,6 @@
conv_name,
rd_count, rd);
}
- GNUNET_free (conv_name);
}
if (GNUNET_OK == res)
{
@@ -684,8 +688,10 @@
conv_name,
rd_count, rd);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_free (conv_name);
return;
}
+ GNUNET_free (conv_name);
}
send_store_response (client, res, rid);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
Modified: gnunet/src/namestore/test_namestore_api_store.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_store.c 2013-10-17 07:48:25 UTC
(rev 30245)
+++ gnunet/src/namestore/test_namestore_api_store.c 2013-10-17 08:01:38 UTC
(rev 30246)
@@ -102,6 +102,8 @@
"Name store added record for `%s': %s\n",
name,
(success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_SCHEDULER_add_now (&end, NULL);
}
Modified: gnunet/src/namestore/test_namestore_api_store_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_store_update.c 2013-10-17
07:48:25 UTC (rev 30245)
+++ gnunet/src/namestore/test_namestore_api_store_update.c 2013-10-17
08:01:38 UTC (rev 30246)
@@ -61,7 +61,7 @@
static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
-static const char * name = "dummy.dummy.gnunet";
+static const char *name = "dummy";
static void
@@ -166,6 +166,8 @@
GNUNET_assert (TEST_RECORD_DATALEN2 == rd[0].data_size);
GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data,
TEST_RECORD_DATALEN2));
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_SCHEDULER_add_now (&end, NULL);
}
}
@@ -179,16 +181,11 @@
ncqe = NULL;
GNUNET_assert (NULL != cls);
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Namestore returned no block\n"));
+ _("Namecache returned no block for `%s'\n"),
+ name);
if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
@@ -196,7 +193,7 @@
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Namestore returned block, decrypting \n");
+ "Namecache returned block, decrypting \n");
GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt(block,
&pubkey, name, &rd_decrypt_cb, (void *) name));
}
@@ -215,7 +212,12 @@
name,
(success == GNUNET_OK) ? "SUCCESS" : "FAIL");
/* Create derived hash */
- GNUNET_GNSRECORD_query_from_private_key (privkey, name, &derived_hash);
+ GNUNET_GNSRECORD_query_from_private_key (privkey,
+ name,
+ &derived_hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Looking in namecache for `%s'\n",
+ GNUNET_h2s (&derived_hash));
ncqe = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash,
&name_lookup_proc, (void *) name);
}
@@ -253,14 +255,15 @@
GNUNET_break (NULL != nsh);
nch = GNUNET_NAMECACHE_connect (cfg);
GNUNET_break (NULL != nch);
- nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
- 1, &rd, &put_cont, (void *) name);
+ nsqe = GNUNET_NAMESTORE_records_store (nsh,
+ privkey, name,
+ 1, &rd,
+ &put_cont, (void *) name);
if (NULL == nsqe)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namestore cannot store no block\n"));
}
-
GNUNET_free ((void *)rd.data);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30246 - gnunet/src/namestore,
gnunet <=