From: oetiker Date: Sat, 15 Jan 2011 12:53:43 +0000 (+0000) Subject: make sure we do not free stuff in rrdnew which was simply copied from rrdold and... X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=229299d37058467e2645a3a874d231528e7c5f44;p=rrdtool.git make sure we do not free stuff in rrdnew which was simply copied from rrdold and thus gets freed there already ... git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.3/program@2169 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/src/rrd_resize.c b/src/rrd_resize.c index 8e9ab01..754599c 100644 --- a/src/rrd_resize.c +++ b/src/rrd_resize.c @@ -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); }