From f326fb85c52d9b7c13023c98795674c379269349 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 14 Mar 2012 13:30:36 +0000 Subject: - fix --- src/namestore/namestore_api.c | 14 ++++++++++---- src/namestore/test_namestore_api_zone_to_name.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index 9c629b026..85f14cdcf 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c @@ -258,8 +258,11 @@ handle_lookup_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe, } name = (char *) &msg[1]; - GNUNET_assert ('\0' == name[name_len -1]); - GNUNET_assert ((name_len - 1) == strlen(name)); + if (name_len > 0) + { + GNUNET_assert ('\0' == name[name_len -1]); + GNUNET_assert ((name_len - 1) == strlen(name)); + } rd_tmp = &name[name_len]; /* deserialize records */ @@ -479,8 +482,11 @@ handle_zone_to_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe, expire = GNUNET_TIME_absolute_ntoh(msg->expire); name_tmp = (char *) &msg[1]; - GNUNET_assert ('\0' == name_tmp[name_len -1]); - GNUNET_assert (name_len -1 == strlen(name_tmp)); + if (name_len > 0) + { + GNUNET_assert ('\0' == name_tmp[name_len -1]); + GNUNET_assert (name_len -1 == strlen(name_tmp)); + } rd_tmp = &name_tmp[name_len]; struct GNUNET_NAMESTORE_RecordData rd[rd_count]; diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 9122e849b..ad9acc890 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -216,7 +216,7 @@ run (void *cls, char *const *args, const char *cfgfile, delete_existing_db(cfg); endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); - GNUNET_asprintf(&s_name, "dummy.dummy.gnunet"); + GNUNET_asprintf(&s_name, "dummy"); /* load privat key */ -- cgit v1.2.3