← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/collectd/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/collectd_memleak.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Morten Kjeldgaard
  • Date: 2008-11-18 15:54:20 UTC
  • mfrom: (1.1.5 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20081118155420-sc2mxv2pebafkmon
Tags: 4.4.2-2ubuntu1
https://launchpad.net/bugs/298828
* Merge from Debian unstable (LP: #298828). Remaining Ubuntu changes:
* Add ubuntu_in6-glibc28.dpatch patch, fix FTBFS.
* Add ubuntu_hardening.dpatch patch, fix FTBFS.
* Add ubuntu_perl.c.dpatch, fix FTBFS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/collectd_memleak.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## collectd_memleak.dpatch by Peter Holik <holik@it-technology.at>
 
3
##
 
4
## DP: Free allocated memory before returning in an error condition.
 
5
## DP: (This is upstream Git commit 111a5eb7b68da0478b16de31dff422a213a03799)
 
6
 
 
7
@DPATCH@
 
8
 
 
9
diff a/src/utils_threshold.c b/src/utils_threshold.c
 
10
--- a/src/utils_threshold.c
 
11
+++ b/src/utils_threshold.c
 
12
@@ -711,6 +711,7 @@ int ut_check_interesting (const char *name)
 
13
   if (status != 0)
 
14
   {
 
15
     ERROR ("ut_check_interesting: parse_identifier failed.");
 
16
+    sfree (name_copy);
 
17
     return (-1);
 
18
   }
 
19