From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 29 Jun 2015 09:08:18 +0000 (+0200)
Subject: rrd_graph did not  process --grid-dash option ... fixed
X-Git-Tag: v1.5.4~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=737cd4f65fe0681d5d681e91a8fc54f30daa943e;p=thirdparty%2Frrdtool-1.x.git

rrd_graph did not  process --grid-dash option ... fixed
---

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 74258901..9e5912e2 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -5049,12 +5049,15 @@ void rrd_graph_options(
             if(sscanf(optarg,
                       "%40[0-9.e+-]:%40[0-9.e+-]",
                       double_str,
-                      double_str2 ) != 2) {
+                      double_str2 ) == 2) {
                 if ( rrd_strtodbl( double_str, 0, &(im->grid_dash_on),NULL) !=2
                      || rrd_strtodbl( double_str2, 0, &(im->grid_dash_off), NULL) != 2 ){
                     rrd_set_error("expected grid-dash format float:float");
                     return;
                 }
+            } else {
+                    rrd_set_error("invalid grid-dash format");
+                    return;
             }
             break;
         case 1009: /* enable dynamic labels */