X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=23be6e03d805b898c9243092f379c3021d4352f1;hb=f4abf7d18767b842801a7c38f922e34e0ff3c890;hp=33465b31deed3b0a8b789f34e2bfc66f1f79540a;hpb=77ebb82c2fb1ff5a595df699f9410b1f522d62d9;p=rrdtool.git

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 33465b3..23be6e0 100644
--- 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) {
@@ -465,6 +467,7 @@ int rrd_fetch_fn(
     }
 
     rrd_close(rrd_file);
+    rrd_free(&rrd);
     return (0);
   err_free_data:
     free(*data);