fixed another seek issue ...

[rrdtool.git] / src / rrd_fetch.c

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 33465b3..8a0a3ec 100644 (file)
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
@@ -384,12 +384,14 @@ int rrd_fetch_fn(
             rra_start_time, rra_end_time, start_offset, end_offset);
 #endif
     /* only seek if the start time is before the end time */
-    if (*start <= rra_end_time && *end >= rra_start_time - step ){
+    if (*start <= rra_end_time && *end >= rra_start_time - *step ){
         if (start_offset <= 0)
             rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1;
         else
             rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1 + start_offset;
 
+        rra_pointer = rra_pointer % (signed) rrd.rra_def[chosen_rra].row_cnt;
+         
         if (rrd_seek(rrd_file, (rra_base + (rra_pointer * (*ds_cnt)
                                         * sizeof(rrd_value_t))),
                  SEEK_SET) != 0) {