svn commit: r530222 - in head/databases/rrdtool: . files
Niclas Zeising
zeising at FreeBSD.org
Wed Apr 1 15:41:09 UTC 2020
Author: zeising
Date: Wed Apr 1 15:32:13 2020
New Revision: 530222
URL: https://svnweb.freebsd.org/changeset/ports/530222
Log:
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
Added:
head/databases/rrdtool/files/patch-src_rrd__graph__helper.c (contents, props changed)
Modified:
head/databases/rrdtool/Makefile
Modified: head/databases/rrdtool/Makefile
==============================================================================
--- head/databases/rrdtool/Makefile Wed Apr 1 15:25:35 2020 (r530221)
+++ head/databases/rrdtool/Makefile Wed Apr 1 15:32:13 2020 (r530222)
@@ -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/
Added: head/databases/rrdtool/files/patch-src_rrd__graph__helper.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/rrdtool/files/patch-src_rrd__graph__helper.c Wed Apr 1 15:32:13 2020 (r530222)
@@ -0,0 +1,25 @@
+Backport of:
+
+commit 254e4e44cd7828fba8f5bb18a7a29668221e0af5
+Author: John W. O'Brien <john at 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;
More information about the svn-ports-all
mailing list