X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmeta_data.c;h=b6483e8bf77681fbd798b319f282fccd1510f583;hb=9204a08464154faaca89690ad205989c121335cb;hp=b502b377295141a8a095ba248d7e6de0ab285072;hpb=488c2ca9e3f6f6082f192bdd5d737c6cd1298ba2;p=collectd.git

diff --git a/src/meta_data.c b/src/meta_data.c
index b502b377..b6483e8b 100644
--- a/src/meta_data.c
+++ b/src/meta_data.c
@@ -312,7 +312,13 @@ int meta_data_toc (meta_data_t *md, char ***toc) /* {{{ */
   for (e = md->head; e != NULL; e = e->next)
     ++count;    
 
-  *toc = malloc(count * sizeof(**toc));
+  if (count == 0)
+  {
+    pthread_mutex_unlock (&md->lock);
+    return (count);
+  }
+
+  *toc = calloc(count, sizeof(**toc));
   for (e = md->head; e != NULL; e = e->next)
     (*toc)[i++] = strdup(e->key);
   
@@ -482,7 +488,7 @@ int meta_data_get_string (meta_data_t *md, /* {{{ */
 
   if (e->type != MD_TYPE_STRING)
   {
-    ERROR ("meta_data_get_signed_int: Type mismatch for key `%s'", e->key);
+    ERROR ("meta_data_get_string: Type mismatch for key `%s'", e->key);
     pthread_mutex_unlock (&md->lock);
     return (-ENOENT);
   }