From 169428384c588cb42e233d1dd408e9e5a1c3a643 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 5 Jan 2012 15:22:50 +0100 Subject: [PATCH] patches: Removed bts596128-reheap-fix -- included upstream. --- debian/changelog | 3 +- debian/patches/00list | 1 - debian/patches/bts596128-reheap-fix.dpatch | 46 ---------------------- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100755 debian/patches/bts596128-reheap-fix.dpatch diff --git a/debian/changelog b/debian/changelog index 72c8a2d..37ad8be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,8 +22,9 @@ collectd (4.10.4-1) unstable; urgency=low * debian/patches: - Removed bts595756-notify_email-segfault -- included upstream. - Removed bts592623-curl_json-file -- included upstream. + - Removed bts596128-reheap-fix -- included upstream. - -- Sebastian Harl Thu, 05 Jan 2012 15:21:24 +0100 + -- Sebastian Harl Thu, 05 Jan 2012 15:22:34 +0100 collectd (4.10.1-2.1) unstable; urgency=high diff --git a/debian/patches/00list b/debian/patches/00list index a9b3cba..6c064bf 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,5 +1,4 @@ rrd_filter_path.dpatch collection_conf_path.dpatch bts559801_plugin_find_fix.dpatch -bts596128-reheap-fix.dpatch CVE-2010-4336.dpatch diff --git a/debian/patches/bts596128-reheap-fix.dpatch b/debian/patches/bts596128-reheap-fix.dpatch deleted file mode 100755 index 8a4dd9d..0000000 --- a/debian/patches/bts596128-reheap-fix.dpatch +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## bts596128-reheap-fix.dpatch by Florian Forster -## -## DP: src/utils_heap.c: Fix calculation of the parent's index. -## DP: -## DP: This resulted in the "upwards" reheap function to return prematurely, -## DP: leaving the heap condition violated. - -@DPATCH@ - -diff a/src/utils_heap.c b/src/utils_heap.c ---- a/src/utils_heap.c -+++ b/src/utils_heap.c -@@ -96,7 +96,7 @@ static void reheap (c_heap_t *h, size_t root, enum reheap_direction dir) - return; - - if (dir == DIR_UP) -- reheap (h, root / 2, dir); -+ reheap (h, (root - 1) / 2, dir); - else if (dir == DIR_DOWN) - reheap (h, min, dir); - } /* void reheap */ -@@ -140,6 +140,8 @@ void c_heap_destroy (c_heap_t *h) - - int c_heap_insert (c_heap_t *h, void *ptr) - { -+ size_t index; -+ - if ((h == NULL) || (ptr == NULL)) - return (-EINVAL); - -@@ -162,11 +164,12 @@ int c_heap_insert (c_heap_t *h, void *ptr) - } - - /* Insert the new node as a leaf. */ -- h->list[h->list_len] = ptr; -+ index = h->list_len; -+ h->list[index] = ptr; - h->list_len++; - - /* Reorganize the heap from bottom up. */ -- reheap (h, /* parent of this node = */ (h->list_len - 1) / 2, DIR_UP); -+ reheap (h, /* parent of this node = */ (index - 1) / 2, DIR_UP); - - pthread_mutex_unlock (&h->lock); - return (0); -- 2.30.2