X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fcontainer_meta_data.c;h=039ba86ab2dfc4c26dca7a3194efced41aa99e3b;hb=555214089c7045298f23fea9e060ea931804e75f;hp=dd7165ba93c73d5db67effcbec7d194eaae42abc;hpb=0296fe30f002512dbde10f73ce7c57bf0085db7d;p=oweals%2Fgnunet.git

diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index dd7165ba9..039ba86ab 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -474,6 +474,8 @@ GNUNET_CONTAINER_meta_data_iterate (const struct
 {
   struct MetaItem *pos;
 
+  if (md == NULL)
+    return 0;
   if (iter == NULL)
     return md->item_count;
   pos = md->items;
@@ -509,6 +511,8 @@ GNUNET_CONTAINER_meta_data_get_by_type (const struct GNUNET_CONTAINER_MetaData
 {
   struct MetaItem *pos;
 
+  if (md == NULL)
+    return NULL;
   pos = md->items;
   while (NULL != pos)
     {
@@ -542,6 +546,8 @@ GNUNET_CONTAINER_meta_data_get_first_by_types (const struct
   va_list args;
   enum EXTRACTOR_MetaType type;
 
+  if (md == NULL)
+    return NULL;
   ret = NULL;
   va_start (args, md);
   while (1)
@@ -574,11 +580,14 @@ GNUNET_CONTAINER_meta_data_get_thumbnail (const struct
   struct MetaItem *pos;
   struct MetaItem *match;
 
+  if (md == NULL)
+    return 0;
   match = NULL;
   pos = md->items;
   while (NULL != pos)
-    {
-      if ( (0 == strncasecmp ("image/", pos->mime_type,
+    {      
+      if ( (NULL != pos->mime_type) && 
+	   (0 == strncasecmp ("image/", pos->mime_type,
 			      strlen("image/"))) &&
 	   (pos->format == EXTRACTOR_METAFORMAT_BINARY) )
 	{