Merge pull request #3329 from efuss/fix-3311

[collectd.git] / src / target_set.c

diff --git a/src/target_set.c b/src/target_set.c
index 47e2d29..4bbd2c0 100644 (file)
--- a/src/target_set.c
+++ b/src/target_set.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
-#include "meta_data.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
 #include "utils_subst.h"
 
 struct ts_key_list_s {
@@ -353,6 +353,7 @@ static int ts_invoke(const data_set_t *ds, value_list_t *vl, /* {{{ */
     int status = meta_data_toc(data->meta, &meta_toc);
     if (status < 0) {
       ERROR("Target `set': meta_data_toc failed with status %d.", status);
+      meta_data_destroy(new_meta);
       return status;
     }
     size_t meta_entries = (size_t)status;