X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=2c30a980735dd40f24b6fb575672ea6e8c1ef865;hb=95df04d6dd28f811004faf0cd000e7f0e82beba7;hp=8a0a3ec1cb8e711f356c519ed582247d3369355f;hpb=03f94b7314738784749867c54263a3b376dc2b1a;p=rrdtool.git

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 8a0a3ec..2c30a98 100644
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
@@ -221,7 +221,7 @@ int rrd_fetch_fn(
     long      best_full_step_diff = 0, best_part_step_diff =
         0, tmp_step_diff = 0, tmp_match = 0, best_match = 0;
     long      full_match, rra_base;
-    long      start_offset, end_offset;
+    off_t     start_offset, end_offset;
     int       first_full = 1;
     int       first_part = 1;
     rrd_t     rrd;
@@ -384,7 +384,7 @@ 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 - (off_t)*step ){
         if (start_offset <= 0)
             rra_pointer = rrd.rra_ptr[chosen_rra].cur_row + 1;
         else
@@ -467,6 +467,7 @@ int rrd_fetch_fn(
     }
 
     rrd_close(rrd_file);
+    rrd_free(&rrd);
     return (0);
   err_free_data:
     free(*data);