-ftbfs

3 files changed, 24 insertions, 18 deletions

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index cf1b555a5..9b2d9b6f3 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -950,11 +950,13 @@ refresh_block (struct NamestoreClient *nc,
   }
   exp_time = GNUNET_GNSRECORD_record_get_expiration_time (res_count, res);
   if (cache_keys)
-    block =
-      GNUNET_GNSRECORD_block_create2 (zone_key, exp_time, name, res, res_count);
+    GNUNET_assert (GNUNET_OK ==
+      GNUNET_GNSRECORD_block_create2 (zone_key, exp_time, name,
+                                      res, res_count, &block));
   else
-    block =
-      GNUNET_GNSRECORD_block_create (zone_key, exp_time, name, res, res_count);
+    GNUNET_assert (GNUNET_OK ==
+      GNUNET_GNSRECORD_block_create (zone_key, exp_time, name,
+                                     res, res_count, &block));
   GNUNET_assert (NULL != block);
   GNUNET_IDENTITY_key_get_public (zone_key, &pkey);
   GNUNET_log (
diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c
index 7e8c1fb8b..3392a19d7 100644
--- a/src/zonemaster/gnunet-service-zonemaster-monitor.c
+++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c
@@ -255,17 +255,19 @@ perform_dht_put (const struct GNUNET_IDENTITY_PrivateKey *key,
   expire = GNUNET_GNSRECORD_record_get_expiration_time (rd_public_count,
                                                         rd_public);
   if (cache_keys)
-    block = GNUNET_GNSRECORD_block_create2 (key,
-                                            expire,
-                                            label,
-                                            rd_public,
-                                            rd_public_count);
+    GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_create2 (key,
+                                                                expire,
+                                                                label,
+                                                                rd_public,
+                                                                rd_public_count,
+                                                                &block));
   else
-    block = GNUNET_GNSRECORD_block_create (key,
-                                           expire,
-                                           label,
-                                           rd_public,
-                                           rd_public_count);
+    GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_create (key,
+                                                               expire,
+                                                               label,
+                                                               rd_public,
+                                                               rd_public_count,
+                                                               &block));
   if (NULL == block)
   {
     GNUNET_break (0);
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c
index 2957cfee2..bacafb97c 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -594,17 +594,19 @@ perform_dht_put (const struct GNUNET_IDENTITY_PrivateKey *key,
   expire = GNUNET_GNSRECORD_record_get_expiration_time (rd_public_count,
                                                         rd_public);
   if (cache_keys)
-    block = GNUNET_GNSRECORD_block_create2 (key,
+    GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_create2 (key,
                                             expire,
                                             label,
                                             rd_public,
-                                            rd_public_count);
+                                            rd_public_count,
+                                            &block));
   else
-    block = GNUNET_GNSRECORD_block_create (key,
+    GNUNET_assert (GNUNET_OK ==  GNUNET_GNSRECORD_block_create (key,
                                            expire,
                                            label,
                                            rd_public,
-                                           rd_public_count);
+                                           rd_public_count,
+                                           &block));
   if (NULL == block)
   {
     GNUNET_break (0);