aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_directory.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2009-09-09 13:21:00 +0000
committerChristian Grothoff <christian@grothoff.org>2009-09-09 13:21:00 +0000
commit093b7df3e0e27981441946bc45b318463ef2ce31 (patch)
treecb8baaa5a7386197a0b87c96c56b7dd2efedb6c4 /src/fs/fs_directory.c
parentc2017c2ba13736ee1fe4dc9d811d49bee1641ca3 (diff)
downloadgnunet-093b7df3e0e27981441946bc45b318463ef2ce31.tar.gz
gnunet-093b7df3e0e27981441946bc45b318463ef2ce31.zip
more testing
Diffstat (limited to 'src/fs/fs_directory.c')
-rw-r--r--src/fs/fs_directory.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 89a016efd..00407ad3a 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -490,8 +490,9 @@ block_align (size_t start,
490 * @param bld directory to finish 490 * @param bld directory to finish
491 * @param rsize set to the number of bytes needed 491 * @param rsize set to the number of bytes needed
492 * @param rdata set to the encoded directory 492 * @param rdata set to the encoded directory
493 * @return GNUNET_OK on success
493 */ 494 */
494void 495int
495GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld, 496GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
496 size_t *rsize, 497 size_t *rsize,
497 void **rdata) 498 void **rdata)
@@ -541,7 +542,15 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
541 } 542 }
542 } 543 }
543 *rsize = size; 544 *rsize = size;
544 data = GNUNET_malloc (size); 545 data = GNUNET_malloc_large (size);
546 if (data == NULL)
547 {
548 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
549 "malloc");
550 *rsize = 0;
551 *rdata = NULL;
552 return GNUNET_SYSERR;
553 }
545 *rdata = data; 554 *rdata = data;
546 memcpy (data, GNUNET_DIRECTORY_MAGIC, 8); 555 memcpy (data, GNUNET_DIRECTORY_MAGIC, 8);
547 off = 8; 556 off = 8;
@@ -572,6 +581,7 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
572 GNUNET_assert (off == size); 581 GNUNET_assert (off == size);
573 GNUNET_CONTAINER_meta_data_destroy (bld->meta); 582 GNUNET_CONTAINER_meta_data_destroy (bld->meta);
574 GNUNET_free (bld); 583 GNUNET_free (bld);
584 return GNUNET_OK;
575} 585}
576 586
577 587