Code

prepare for the release of rrdtool-1.3.8
[rrdtool-all.git] / program / src / rrd_fetch.c
index b6aab91c4e7705f9d55109507c4cea992885e134..9099e7075af6d19577ed2d2e92e356865a446690 100644 (file)
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3.4  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.8  Copyright by Tobi Oetiker, 1997-2009
  *****************************************************************************
  * rrd_fetch.c  read date from an rrd to use for further processing
  *****************************************************************************
@@ -366,6 +366,8 @@ int rrd_fetch_fn(
         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) {
@@ -441,6 +443,8 @@ int rrd_fetch_fn(
     }
 
     rrd_close(rrd_file);
+    rrd_free(&rrd);
+
     return (0);
   err_free_data:
     free(*data);