X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_resize.c;h=3613d3f2b8db8fb4e889563ea488b878a5e224b5;hb=f0a0cb7901538324a33a106ea4762f2ada88970b;hp=81410251d0071583db8a5f24cd12c24fa68a42de;hpb=454dc9735d59ddbbfd1a658541683017e71c294a;p=rrdtool.git diff --git a/src/rrd_resize.c b/src/rrd_resize.c index 8141025..3613d3f 100644 --- a/src/rrd_resize.c +++ b/src/rrd_resize.c @@ -267,9 +267,14 @@ int rrd_resize( /* Move the rest of the CDPs */ while (1) { - if (rrd_read(rrd_file, &buffer, sizeof(rrd_value_t) * 1) <= 0) + ssize_t b_read; + if ((b_read=rrd_read(rrd_file, &buffer, sizeof(rrd_value_t) * 1)) <= 0) break; - rrd_write(rrd_out_file, &buffer, sizeof(rrd_value_t) * 1); + if(rrd_out_file->pos+b_read > rrd_out_file->file_len) { + fprintf(stderr,"WARNING: ignoring last %zu bytes\nWARNING: if you see this message multiple times for a single file you're in trouble\n", b_read); + continue; + } + rrd_write(rrd_out_file, &buffer, b_read); } rrdnew.rra_def[target_rra].row_cnt += modify; rrd_seek(rrd_out_file,