diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-14 13:30:36 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-14 13:30:36 +0000 |
commit | f326fb85c52d9b7c13023c98795674c379269349 (patch) | |
tree | ecb4f0a775bed8a40ec53ac52bd1adb98ea3d844 /src | |
parent | b2519d12505949a041a89cbd5c72e8af80ada746 (diff) | |
download | gnunet-f326fb85c52d9b7c13023c98795674c379269349.tar.gz gnunet-f326fb85c52d9b7c13023c98795674c379269349.zip |
- fix
Diffstat (limited to 'src')
-rw-r--r-- | src/namestore/namestore_api.c | 14 | ||||
-rw-r--r-- | 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, | |||
258 | } | 258 | } |
259 | 259 | ||
260 | name = (char *) &msg[1]; | 260 | name = (char *) &msg[1]; |
261 | GNUNET_assert ('\0' == name[name_len -1]); | 261 | if (name_len > 0) |
262 | GNUNET_assert ((name_len - 1) == strlen(name)); | 262 | { |
263 | GNUNET_assert ('\0' == name[name_len -1]); | ||
264 | GNUNET_assert ((name_len - 1) == strlen(name)); | ||
265 | } | ||
263 | rd_tmp = &name[name_len]; | 266 | rd_tmp = &name[name_len]; |
264 | 267 | ||
265 | /* deserialize records */ | 268 | /* deserialize records */ |
@@ -479,8 +482,11 @@ handle_zone_to_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe, | |||
479 | expire = GNUNET_TIME_absolute_ntoh(msg->expire); | 482 | expire = GNUNET_TIME_absolute_ntoh(msg->expire); |
480 | 483 | ||
481 | name_tmp = (char *) &msg[1]; | 484 | name_tmp = (char *) &msg[1]; |
482 | GNUNET_assert ('\0' == name_tmp[name_len -1]); | 485 | if (name_len > 0) |
483 | GNUNET_assert (name_len -1 == strlen(name_tmp)); | 486 | { |
487 | GNUNET_assert ('\0' == name_tmp[name_len -1]); | ||
488 | GNUNET_assert (name_len -1 == strlen(name_tmp)); | ||
489 | } | ||
484 | rd_tmp = &name_tmp[name_len]; | 490 | rd_tmp = &name_tmp[name_len]; |
485 | 491 | ||
486 | struct GNUNET_NAMESTORE_RecordData rd[rd_count]; | 492 | 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, | |||
216 | delete_existing_db(cfg); | 216 | delete_existing_db(cfg); |
217 | 217 | ||
218 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); | 218 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); |
219 | GNUNET_asprintf(&s_name, "dummy.dummy.gnunet"); | 219 | GNUNET_asprintf(&s_name, "dummy"); |
220 | 220 | ||
221 | 221 | ||
222 | /* load privat key */ | 222 | /* load privat key */ |