fixes

[oweals/gnunet.git] / src / util / test_container_meta_data.c

diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index 4920de05ac038c5813fe50504202270db3dcb575..05047d8b3615e7b8ece48cd3f56fe161674f40fe 100644 (file)
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -238,6 +238,8 @@ check()
   int q;
   int i = 100;
   char txt[128];
+  char *str;
+  unsigned char* thumb;
 
   meta = GNUNET_CONTAINER_meta_data_create ();
   meta2 = GNUNET_CONTAINER_meta_data_create ();
@@ -301,21 +303,24 @@ check()
   
   //check meta_data_get_by_type
   GNUNET_CONTAINER_meta_data_clear(meta2);
-  if (GNUNET_CONTAINER_meta_data_get_by_type(meta2,EXTRACTOR_METATYPE_UNKNOWN) != NULL)
+  if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type(meta2,EXTRACTOR_METATYPE_UNKNOWN)))
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
+      GNUNET_free (str);
       ABORT(meta);      
     } 
   
-  char* str = GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_UNKNOWN);
+  str = GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_UNKNOWN);
+  GNUNET_assert (NULL != str);
   if (str[0] != 'T')
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);      
     } 
   //check branch
-  if (GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_PUBLICATION_DATE) != NULL)
+  if (NULL != (str = GNUNET_CONTAINER_meta_data_get_by_type(meta,EXTRACTOR_METATYPE_PUBLICATION_DATE)))
     {
+      GNUNET_free (str);
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);      
     } 
@@ -324,17 +329,20 @@ check()
   str = GNUNET_CONTAINER_meta_data_get_first_by_types(meta,
                                                      EXTRACTOR_METATYPE_UNKNOWN,
                                                      -1);
+  GNUNET_assert (NULL != str);
   if (str[0] != 'T')
     {
       GNUNET_CONTAINER_meta_data_destroy(meta2);
+      GNUNET_free (str);
       ABORT(meta);      
     } 
-
+  GNUNET_free (str);
+      
   //check meta_data_get_thumbnail
-  unsigned char* thumb;
 
   if (GNUNET_CONTAINER_meta_data_get_thumbnail(meta, &thumb) != 0)
     {
+      GNUNET_free (thumb);
       GNUNET_CONTAINER_meta_data_destroy(meta2);
       ABORT(meta);
     }