From: Florian Forster <octo@collectd.org>
Date: Fri, 17 Nov 2017 12:18:00 +0000 (+0100)
Subject: Merge branch 'collectd-5.7' into collectd-5.8
X-Git-Tag: collectd-5.8.0~11
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7c2336dde35a7b42853b6ca167d4164619e52333;p=collectd.git

Merge branch 'collectd-5.7' into collectd-5.8
---

7c2336dde35a7b42853b6ca167d4164619e52333
diff --cc src/daemon/meta_data.c
index ce3e1020,76846904..4d59b712
--- a/src/daemon/meta_data.c
+++ b/src/daemon/meta_data.c
@@@ -737,9 -737,8 +737,8 @@@ int meta_data_as_string(meta_data_t *md
  
    temp = md_strdup(actual);
    if (temp == NULL) {
-     pthread_mutex_unlock(&md->lock);
      ERROR("meta_data_as_string: md_strdup failed for key `%s'.", key);
 -    return (-ENOMEM);
 +    return -ENOMEM;
    }
  
    *value = temp;