fix

[oweals/gnunet.git] / src / fs / fs_directory.c

diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 1879b1b74423c312ebe48009231ca910a54dee7b..de100c33990232014070b66ab4140d99c9b8beef 100644 (file)
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -120,7 +120,7 @@ struct GetFullDataClosure
  *
  * @param cls closure (user-defined)
  * @param plugin_name name of the plugin that produced this value;
- *        special values can be used (i.e. '<zlib>' for zlib being
+ *        special values can be used (i.e. '&lt;zlib&gt;' for zlib being
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
@@ -189,7 +189,6 @@ GNUNET_FS_directory_list_contents (size_t size,
 {
   struct GetFullDataClosure full_data;
   const char *cdata = data;
-  char *file_data;
   char *emsg;
   uint64_t pos;
   uint64_t align;
@@ -302,10 +301,10 @@ GNUNET_FS_directory_list_contents (size_t size,
               filename,
               uri,
               md,
-              full_data.data,
-              full_data.size);
+              full_data.size,
+              full_data.data);
        }
-      GNUNET_free_non_null (full_data.file_data);
+      GNUNET_free_non_null (full_data.data);
       GNUNET_free_non_null (filename);
       GNUNET_CONTAINER_meta_data_destroy (md);
       GNUNET_FS_uri_destroy (uri);
@@ -402,16 +401,24 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
 
   GNUNET_assert (! GNUNET_FS_uri_test_ksk (uri));
   if (NULL != data)
-    if (GNUNET_FS_uri_test_chk (uri))
-      fsize = GNUNET_FS_uri_chk_get_file_size (uri);
-    else
-      {
-       curi = GNUNET_FS_uri_loc_get_uri (uri);
-       fsize = GNUNET_FS_uri_chk_get_file_size (curi);
-       GNUNET_FS_uri_destroy (curi);
-      }
+    {
+      GNUNET_assert (! GNUNET_FS_uri_test_sks (uri));
+      if (GNUNET_FS_uri_test_chk (uri))
+       {
+         fsize = GNUNET_FS_uri_chk_get_file_size (uri);
+       }
+      else
+       {
+         curi = GNUNET_FS_uri_loc_get_uri (uri);
+         GNUNET_assert (NULL != curi);
+         fsize = GNUNET_FS_uri_chk_get_file_size (curi);
+         GNUNET_FS_uri_destroy (curi);
+       }
+    }
   else
-    fsize = 0; /* not given */
+    {
+      fsize = 0; /* not given */
+    }
   if (fsize > MAX_INLINE_SIZE)
     fsize = 0; /* too large */
   uris = GNUNET_FS_uri_to_string (uri);
@@ -552,6 +559,7 @@ block_align (size_t start,
               badness = cbad;
             }
         }
+      GNUNET_assert (best != -1);
       tmp = perm[i];
       perm[i] = perm[best];
       perm[best] = tmp;
@@ -590,7 +598,7 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
   ssize_t ret;
   uint32_t big;
 
-  size = 8 + sizeof (uint32_t);
+  size = strlen (GNUNET_DIRECTORY_MAGIC) + sizeof (uint32_t);
   size += GNUNET_CONTAINER_meta_data_get_serialized_size (bld->meta);
   sizes = NULL;
   perm = NULL;
@@ -628,11 +636,14 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
                           "malloc");
       *rsize = 0;
       *rdata = NULL;
+      GNUNET_free_non_null (sizes);
+      GNUNET_free_non_null (perm);
+      GNUNET_free_non_null (bes);
       return GNUNET_SYSERR;
     }
   *rdata = data;
-  memcpy (data, GNUNET_DIRECTORY_MAGIC, 8);
-  off = 8;
+  memcpy (data, GNUNET_DIRECTORY_MAGIC, strlen (GNUNET_DIRECTORY_MAGIC));
+  off = strlen (GNUNET_DIRECTORY_MAGIC);
 
   sptr = &data[off + sizeof (uint32_t)];
   ret = GNUNET_CONTAINER_meta_data_serialize (bld->meta,
@@ -641,7 +652,7 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
                                              GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
   GNUNET_assert (ret != -1);
   big = htonl (ret);  
-  memcpy (&data[8], &big, sizeof (uint32_t));
+  memcpy (&data[off], &big, sizeof (uint32_t));
   off += sizeof (uint32_t) + ret;
   for (j = 0; j < bld->count; j++)
     {