From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 24 Feb 2017 16:28:28 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=004074af297a219208fa9e903db8c5dcdd7e1950;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
	src/utils_match.c
---

004074af297a219208fa9e903db8c5dcdd7e1950
diff --cc src/utils_match.c
index 2e487b593,be5dfd6ee..11b3f74f9
--- a/src/utils_match.c
+++ b/src/utils_match.c
@@@ -33,7 -33,9 +33,8 @@@
  
  #include <regex.h>
  
 -#define UTILS_MATCH_FLAGS_FREE_USER_DATA 0x01
  #define UTILS_MATCH_FLAGS_EXCLUDE_REGEX 0x02
+ #define UTILS_MATCH_FLAGS_REGEX 0x04
  
  struct cu_match_s {
    regex_t regex;
@@@ -301,8 -273,12 +303,12 @@@ void match_destroy(cu_match_t *obj) 
    if (obj == NULL)
      return;
  
 -  if (obj->flags & UTILS_MATCH_FLAGS_FREE_USER_DATA)
 -    sfree(obj->user_data);
+   if (obj->flags & UTILS_MATCH_FLAGS_REGEX)
+     regfree(&obj->regex);
+   if (obj->flags & UTILS_MATCH_FLAGS_EXCLUDE_REGEX)
+     regfree(&obj->excluderegex);
 +  if ((obj->user_data != NULL) && (obj->free != NULL))
 +    (*obj->free)(obj->user_data);
  
    sfree(obj);
  } /* void match_destroy */