- fix

2 files changed, 3 insertions, 2 deletions

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 5a0206726..dc81ccea3 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -1239,7 +1239,7 @@ handle_zone_to_name_it (void *cls,
     /* found result */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found results: name is `%s', has %u records\n", name, rd_count);
     res = GNUNET_YES;
-    name_len = strlen (name);
+    name_len = strlen (name) +1;
   }
   else
   {
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 2a70d7612..316b0f40d 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -477,7 +477,8 @@ 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]);
+    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];