-minor fixes

4 files changed, 13 insertions, 10 deletions

diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index 7cbc880a26..f844217e8f 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -168,7 +168,8 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++];
   pkc->uc = GNUNET_FS_publish_ublock_ (pkc->h,
 				       pkc->dsh,
-				       keyword, NULL,
+				       keyword + 1 /* skip '+' */,
+				       NULL,
 				       GNUNET_CRYPTO_ecc_key_get_anonymous (),
 				       pkc->meta,
 				       pkc->uri,
diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c
index d4f65edc32..71997fda04 100644
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -190,7 +190,7 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
   uris = GNUNET_FS_uri_to_string (uri);
   slen = strlen (uris) + 1;
   if (NULL == ulabel)
-    ulen = 0;
+    ulen = 1;
   else
     ulen = strlen (ulabel) + 1;
   size = mdsize + sizeof (struct UBlock) + slen + ulen;
@@ -201,7 +201,8 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h,
   }
   ub_plain = GNUNET_malloc (size);
   kbe = (char *) &ub_plain[1];
-  memcpy (kbe, ulabel, ulen);
+  if (NULL != ulabel)
+    memcpy (kbe, ulabel, ulen);
   kbe += ulen;
   memcpy (kbe, uris, slen);
   kbe += slen;
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 3b0db04296..a0fec03a1c 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -558,7 +558,7 @@ process_ksk_result (struct GNUNET_FS_SearchContext *sc,
   is_new = (NULL == sr) || (sr->mandatory_missing > 0);
   if (NULL == sr)
   {
-    sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
+    sr = GNUNET_new (struct GNUNET_FS_SearchResult);
     sr->h = sc->h;
     sr->sc = sc;
     sr->anonymity = sc->anonymity;
@@ -639,7 +639,7 @@ process_sks_result (struct GNUNET_FS_SearchContext *sc, const char *id_update,
                                                   &test_result_present,
                                                   (void *) uri))
     return;                     /* duplicate result */
-  sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
+  sr = GNUNET_new (struct GNUNET_FS_SearchResult);
   sr->h = sc->h;
   sr->sc = sc;
   sr->anonymity = sc->anonymity;
@@ -721,7 +721,8 @@ decrypt_block_with_keyword (const struct GNUNET_FS_SearchContext *sc,
  * @param size size of nb
  */
 static void
-process_kblock (struct GNUNET_FS_SearchContext *sc, const struct UBlock *ub,
+process_kblock (struct GNUNET_FS_SearchContext *sc, 
+		const struct UBlock *ub,
                 size_t size)
 {
   size_t j;
@@ -793,7 +794,6 @@ process_sblock (struct GNUNET_FS_SearchContext *sc,
   size_t off;
   char *emsg;
 
-  /* decrypt */
   GNUNET_FS_ublock_decrypt_ (&ub[1], len,
 			     &sc->uri->data.sks.ns,
 			     sc->uri->data.sks.identifier,
@@ -837,7 +837,8 @@ process_sblock (struct GNUNET_FS_SearchContext *sc,
  * @param size size of data
  */
 static void
-process_result (struct GNUNET_FS_SearchContext *sc, enum GNUNET_BLOCK_Type type,
+process_result (struct GNUNET_FS_SearchContext *sc, 
+		enum GNUNET_BLOCK_Type type,
                 struct GNUNET_TIME_Absolute expiration, 
 		const void *data,
                 size_t size)
@@ -1106,7 +1107,7 @@ transmit_search_request (void *cls, size_t size, void *buf)
 					 &dpub);
     GNUNET_CRYPTO_hash (&dpub,
 			sizeof (dpub),
-			&sm->query);
+			&sm->query); 
     mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode);
     sqms = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map);
     mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt);
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c
index e493319bed..9f6791bb5b 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/fs/plugin_block_fs.c
@@ -198,7 +198,7 @@ libgnunet_plugin_block_fs_init (void *cls)
   };
   struct GNUNET_BLOCK_PluginFunctions *api;
 
-  api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_fs_evaluate;
   api->get_key = &block_plugin_fs_get_key;
   api->types = types;