From ec66b5558a6e702915a1cb6fcfd048e1a124895b Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 29 May 2009 13:39:30 +0200 Subject: [PATCH] patches: Added rrdtool_uninitialized_fix.dpatch. This is an upstream patch to fix an uninitialized value warning in the rrdtool plugin, thanks to Andreas Moog for reporting this. --- debian/changelog | 5 ++++- .../patches/rrdtool_uninitialized_fix.dpatch | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 debian/patches/rrdtool_uninitialized_fix.dpatch diff --git a/debian/changelog b/debian/changelog index d0a87d3..8048bdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ collectd (4.6.2-2) unstable; urgency=low - Added include_empty_files.dpatch - upstream patch to fix the inclusion of empty configuration files, thanks to Alexander Wirt for reporting this. + - Added rrdtool_uninitialized_fix.dpatch - upstream patch to fix an + uninitialized value warning in the rrdtool plugin, thanks to Andreas + Moog for reporting this. * debian/collectd.conf, debian/filters.conf: - Added a sample filter chain configuration. * debian/rules: @@ -22,7 +25,7 @@ collectd (4.6.2-2) unstable; urgency=low libiptc which is available as shared library since iptables 1.4.3. Depend on versions >= 1.4.3.2-2 because of #524766. - -- Sebastian Harl Thu, 28 May 2009 16:23:01 +0200 + -- Sebastian Harl Fri, 29 May 2009 13:38:13 +0200 collectd (4.6.2-1) unstable; urgency=low diff --git a/debian/patches/rrdtool_uninitialized_fix.dpatch b/debian/patches/rrdtool_uninitialized_fix.dpatch new file mode 100755 index 0000000..1f13a41 --- /dev/null +++ b/debian/patches/rrdtool_uninitialized_fix.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## rrdtool_uninitialized_fix.dpatch by Florian Forster +## +## DP: rrdtool plugin: Make absolutely sure two local variables are +## DP: initialized. + +@DPATCH@ + +diff a/src/rrdtool.c b/src/rrdtool.c +--- a/src/rrdtool.c ++++ b/src/rrdtool.c +@@ -624,6 +624,9 @@ static void *rrd_queue_thread (void *data) + int status; + int i; + ++ values = NULL; ++ values_num = 0; ++ + pthread_mutex_lock (&queue_lock); + /* Wait for values to arrive */ + while (true) -- 2.30.2