complete segfault fix for second axis %s format begun in r2123 (thanks Martin Pelikan...

[rrdtool-all.git] / program / src / rrd_graph.c

diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c
index 2db9eea32970cd42e4bae824eedeaec4ee16b588..04d6023d78061bedb781d2a67da619c7bc8792bf 100644 (file)
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
@@ -1343,6 +1343,8 @@ time_t find_first_time(
     struct tm tm;
 
     localtime_r(&start, &tm);
+    /* let mktime figure this dst on its own */
+    tm.tm_isdst = -1;
 
     switch (baseint) {
     case TMT_SECOND:
@@ -1411,6 +1413,8 @@ time_t find_next_time(
     time_t    madetime;
 
     localtime_r(&current, &tm);
+    /* let mktime figure this dst on its own */
+    tm.tm_isdst = -1;
 
     do {
         switch (baseint) {
@@ -2214,7 +2218,7 @@ int horizontal_log_grid(
                         }
                 }
                 else {
-                      sprintf(graph_label_right,im->second_axis_format,sval);
+                      sprintf(graph_label_right,im->second_axis_format,sval,"");
                 }    
     
                 gfx_text ( im,