From 6c281918d75228d8c766bdc9dfc540f76a8ed028 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 25 Jul 2008 11:29:24 +0200 Subject: [PATCH] Removed bts428780-validate-row-count. This is included in upstream version 1.3. --- debian/changelog | 5 ++- debian/patches/bts428780-validate-row-count | 46 --------------------- debian/patches/series | 1 - 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 debian/patches/bts428780-validate-row-count diff --git a/debian/changelog b/debian/changelog index d6501b5..020e1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ rrdtool (1.3.1-2) experimental; urgency=low * Reupload to unstable - thanks to Marc 'HE' Brockschmidt for the approval. + * debian/patches: + - Removed bts428780-validate-row-count - this is included in upstream + version 1.3. - -- Sebastian Harl Fri, 25 Jul 2008 11:23:41 +0200 + -- Sebastian Harl Fri, 25 Jul 2008 11:28:29 +0200 rrdtool (1.3.1-1) experimental; urgency=low diff --git a/debian/patches/bts428780-validate-row-count b/debian/patches/bts428780-validate-row-count deleted file mode 100644 index e72bbb1..0000000 --- a/debian/patches/bts428780-validate-row-count +++ /dev/null @@ -1,46 +0,0 @@ -diff a/doc/rrdcreate.pod b/doc/rrdcreate.pod ---- a/doc/rrdcreate.pod -+++ b/doc/rrdcreate.pod -@@ -184,6 +184,7 @@ I defines how many of these I are used to build - a I which then goes into the archive. - - I defines how many generations of data values are kept in an B. -+Obviously, this has to be greater than zero. - - =back - -diff a/src/rrd_create.c b/src/rrd_create.c ---- a/src/rrd_create.c -+++ b/src/rrd_create.c -@@ -207,6 +207,7 @@ rrd_create_r(const char *filename, - char *argvcopy; - char *tokptr; - size_t old_size = sizeof(rra_def_t)*(rrd.stat_head->rra_cnt); -+ int row_cnt; - if((rrd.rra_def = rrd_realloc(rrd.rra_def, - old_size+sizeof(rra_def_t)))==NULL) - { -@@ -269,7 +270,10 @@ rrd_create_r(const char *filename, - case CF_SEASONAL: - case CF_DEVPREDICT: - case CF_FAILURES: -- rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = atoi(token); -+ row_cnt = atoi(token); -+ if (row_cnt <= 0) -+ rrd_set_error("Invalid row count: %i", row_cnt); -+ rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt; - break; - default: - rrd.rra_def[rrd.stat_head->rra_cnt].par[RRA_cdp_xff_val].u_val = atof(token); -@@ -350,7 +354,10 @@ rrd_create_r(const char *filename, - rrd_set_error("Unexpected extra argument for consolidation function DEVPREDICT"); - break; - default: -- rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = atoi(token); -+ row_cnt = atoi(token); -+ if (row_cnt <= 0) -+ rrd_set_error("Invalid row count: %i", row_cnt); -+ rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt; - break; - } - break; diff --git a/debian/patches/series b/debian/patches/series index ee2f08a..69cecaa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ bts428778-floating-point-exception -bts428780-validate-row-count setup.py-module-name no-rpath-for-ruby no-rpath-for-perl -- 2.30.2