Attachment 212408 Details for Bug 244808 – databases/rrdtool: Backport fix for upstream bug #1078

databases/rrdtool: Backport fix for upstream bug #1078

patch-databases_rrdtool-1.7.2_2.txt (text/plain), 1.85 KB, created by John W. O'Brien on 2020-03-14 17:55:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. O'Brien

Created: 2020-03-14 17:55:20 UTC

Size: 1.85 KB

patch

obsolete

>Index: databases/rrdtool/Makefile
>===================================================================
>--- databases/rrdtool/Makefile	(revision 528415)
>+++ databases/rrdtool/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	rrdtool
> PORTVERSION=	1.7.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	databases graphics
> MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
> 
>Index: databases/rrdtool/files/patch-src_rrd__graph__helper.c
>===================================================================
>--- databases/rrdtool/files/patch-src_rrd__graph__helper.c	(nonexistent)
>+++ databases/rrdtool/files/patch-src_rrd__graph__helper.c	(working copy)
>@@ -0,0 +1,25 @@
>+Backport of:
>+
>+commit 254e4e44cd7828fba8f5bb18a7a29668221e0af5
>+Author: John W. O'Brien <john@saltant.com>
>+Date:   Sat Mar 14 08:49:47 2020 -0400
>+
>+    Fix double meaning of time 0 as uninitialized value
>+
>+    Treat "VRULE:0#..." as "VRULE:1#..." because elsewhere xrule==0 is
>+    used to mean xrule has not been set, which can lead to an array
>+    bounds violation.
>+
>+--- src/rrd_graph_helper.c.orig	2020-03-14 17:06:47 UTC
>++++ src/rrd_graph_helper.c
>+@@ -776,6 +776,10 @@ static graph_desc_t* newGraphDescription(image_desc_t 
>+               }
>+               if (gf==GF_VRULE){
>+                  gdp->xrule=val;
>++                 if (gdp->xrule == 0) {
>++                    /* distinguish from uninitialized */
>++                    gdp->xrule++;
>++                 }
>+               }
>+               else {
>+                  gdp->yrule=val;
>
>Property changes on: databases/rrdtool/files/patch-src_rrd__graph__helper.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 244808: 212408