From: Sebastian Harl <sh@tokkee.org>
Date: Wed, 17 Sep 2008 08:30:30 +0000 (+0200)
Subject: Added debian/patches/collectd_memleak.dpatch.
X-Git-Tag: collectd-4.4.2-2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e8ca303fd23ffc8eead9b92bdca30582598b7f3;p=pkg-collectd.git

Added debian/patches/collectd_memleak.dpatch.

Trivial upstream patch to fix a possible memory leak.
---

diff --git a/debian/changelog b/debian/changelog
index 3481a96..afc5acf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ collectd (4.4.2-2) unstable; urgency=low
     loading the ipmi plugin caused by that work around (Closes: #494665).
   * Added debian/patches/memory_libstatgrab.dpatch - trivial upstream patch to
     fix a typo in the libstatgrab code of the memory plugin.
+  * Added debian/patches/collectd_memleak.dpatch - trivial upstream patch to
+    fix a possible memory leak.
 
- -- Sebastian Harl <sh@tokkee.org>  Wed, 17 Sep 2008 10:19:47 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Wed, 17 Sep 2008 10:28:36 +0200
 
 collectd (4.4.2-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index bc01ecd..d2a82d9 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,4 +2,5 @@ rrd_filter_path.dpatch
 collection_conf_path.dpatch
 myplugin_strcpy.dpatch
 memory_libstatgrab.dpatch
+collectd_memleak.dpatch
 
diff --git a/debian/patches/collectd_memleak.dpatch b/debian/patches/collectd_memleak.dpatch
new file mode 100755
index 0000000..132f2c7
--- /dev/null
+++ b/debian/patches/collectd_memleak.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## collectd_memleak.dpatch by Peter Holik <holik@it-technology.at>
+##
+## DP: Free allocated memory before returning in an error condition.
+## DP: (This is upstream Git commit 111a5eb7b68da0478b16de31dff422a213a03799)
+
+@DPATCH@
+
+diff a/src/utils_threshold.c b/src/utils_threshold.c
+--- a/src/utils_threshold.c
++++ b/src/utils_threshold.c
+@@ -711,6 +711,7 @@ int ut_check_interesting (const char *name)
+   if (status != 0)
+   {
+     ERROR ("ut_check_interesting: parse_identifier failed.");
++    sfree (name_copy);
+     return (-1);
+   }
+