diff options
-rw-r--r-- | src/fs/test_fs_uri.c | 2 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore-fcfsd.c | 20 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c index 2fc5b2a2d..bef60f4e6 100644 --- a/src/fs/test_fs_uri.c +++ b/src/fs/test_fs_uri.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2003, 2004, 2006, 2007, 2009 Christian Grothoff (and other contributing authors) | 3 | (C) 2003-2014 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index d19a38ce9..5286b9056 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2012-2013 Christian Grothoff (and other contributing authors) | 3 | (C) 2012-2014 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -248,6 +248,16 @@ run_httpd_now () | |||
248 | } | 248 | } |
249 | 249 | ||
250 | 250 | ||
251 | /** | ||
252 | * Process a record that was stored in the namestore, adding | ||
253 | * the information to the HTML. | ||
254 | * | ||
255 | * @param cls closure with the `struct ZoneinfoRequest *` | ||
256 | * @param zone_key private key of the zone; NULL on disconnect | ||
257 | * @param name label of the records; NULL on disconnect | ||
258 | * @param rd_len number of entries in @a rd array, 0 if label was deleted | ||
259 | * @param rd array of records with data to store | ||
260 | */ | ||
251 | static void | 261 | static void |
252 | iterate_cb (void *cls, | 262 | iterate_cb (void *cls, |
253 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, | 263 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, |
@@ -304,7 +314,12 @@ iterate_cb (void *cls, | |||
304 | pkey = GNUNET_GNSRECORD_value_to_string (rd->record_type, | 314 | pkey = GNUNET_GNSRECORD_value_to_string (rd->record_type, |
305 | rd->data, | 315 | rd->data, |
306 | rd->data_size); | 316 | rd->data_size); |
307 | 317 | if (NULL == pkey) | |
318 | { | ||
319 | GNUNET_break (0); | ||
320 | GNUNET_NAMESTORE_zone_iterator_next (zr->list_it); | ||
321 | return; | ||
322 | } | ||
308 | if (bytes_free < (strlen (name) + strlen (pkey) + 40)) | 323 | if (bytes_free < (strlen (name) + strlen (pkey) + 40)) |
309 | { | 324 | { |
310 | new_buf = GNUNET_malloc (zr->buf_len * 2); | 325 | new_buf = GNUNET_malloc (zr->buf_len * 2); |
@@ -323,7 +338,6 @@ iterate_cb (void *cls, | |||
323 | } | 338 | } |
324 | 339 | ||
325 | 340 | ||
326 | |||
327 | /** | 341 | /** |
328 | * Handler that returns FCFS zoneinfo page. | 342 | * Handler that returns FCFS zoneinfo page. |
329 | * | 343 | * |