Code

make sure we do not free stuff in rrdnew which was simply copied from rrdold and...
authoroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Sat, 15 Jan 2011 12:53:43 +0000 (12:53 +0000)
committeroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Sat, 15 Jan 2011 12:53:43 +0000 (12:53 +0000)
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.3@2169 a5681a0c-68f1-0310-ab6d-d61299d08faa

program/src/rrd_resize.c

index 8e9ab01fb45e3da41ef955577ff0fd302fa4cbf6..754599caad34a451fa21843ce3bc81bf32f648f6 100644 (file)
@@ -168,6 +168,12 @@ int rrd_resize(
     default:
         rrd_set_error("Do not know how to handle RRD version %s",
                       rrdold.stat_head->version);
+
+        rrdnew.ds_def = NULL;
+        rrdnew.live_head = NULL;
+        rrdnew.pdp_prep = NULL;
+        rrdnew.cdp_prep = NULL;
+
         rrd_free(&rrdnew);
         rrd_free(&rrdold);
         rrd_close(rrd_file);
@@ -289,6 +295,12 @@ int rrd_resize(
     rrd_close(rrd_file);    
     rrd_close(rrd_out_file);    
     rrd_free(&rrdold);
+
+    rrdnew.ds_def = NULL;
+    rrdnew.live_head = NULL;
+    rrdnew.pdp_prep = NULL;
+    rrdnew.cdp_prep = NULL;
+
     rrd_free(&rrdnew);
     return (0);
 }