aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-06-07 22:52:53 +0000
committerChristian Grothoff <christian@grothoff.org>2014-06-07 22:52:53 +0000
commit7d7d63ce11fd452fe7051eaae0ecc589aaa45486 (patch)
tree1b24c4e90ff2fd748cfbc20657ffbee4bfe82823
parentb81e0612360568968b3c3d38a74e467ca2c49afd (diff)
-check return value, doxygen
-rw-r--r--src/fs/test_fs_uri.c2
-rw-r--r--src/namestore/gnunet-namestore-fcfsd.c20
2 files changed, 18 insertions, 4 deletions
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index 2fc5b2a2d4..bef60f4e6d 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2003, 2004, 2006, 2007, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2003-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
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 d19a38ce9b..5286b90566 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2012-2013 Christian Grothoff (and other contributing authors)
+ (C) 2012-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -248,6 +248,16 @@ run_httpd_now ()
}
+/**
+ * Process a record that was stored in the namestore, adding
+ * the information to the HTML.
+ *
+ * @param cls closure with the `struct ZoneinfoRequest *`
+ * @param zone_key private key of the zone; NULL on disconnect
+ * @param name label of the records; NULL on disconnect
+ * @param rd_len number of entries in @a rd array, 0 if label was deleted
+ * @param rd array of records with data to store
+ */
static void
iterate_cb (void *cls,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
@@ -304,7 +314,12 @@ iterate_cb (void *cls,
pkey = GNUNET_GNSRECORD_value_to_string (rd->record_type,
rd->data,
rd->data_size);
-
+ if (NULL == pkey)
+ {
+ GNUNET_break (0);
+ GNUNET_NAMESTORE_zone_iterator_next (zr->list_it);
+ return;
+ }
if (bytes_free < (strlen (name) + strlen (pkey) + 40))
{
new_buf = GNUNET_malloc (zr->buf_len * 2);
@@ -323,7 +338,6 @@ iterate_cb (void *cls,
}
-
/**
* Handler that returns FCFS zoneinfo page.
*