1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

databases/rrdtool: fix segmentation fault

Fix a segmentation fault in rrd_graph:print_calc when vidx is -1 on GF_VRULE
Pull in upstream patch to fix the issue.
This fixes upstream bug #1078

PR:		244808
Submitted by:	John W. O'Brien
This commit is contained in:
Niclas Zeising 2020-04-01 15:32:13 +00:00
parent 4814f2d895
commit 376e420afd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=530222
2 changed files with 26 additions and 1 deletions

View File

@ -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/

View File

@ -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;