X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_create.c;h=6d7cb18e977af78a55a2afc55069d5923e1084d8;hp=028123ef46f4a65ce2704a755b8fd0d5e7dbf1fa;hb=0cc0426da39afd7d41a8f3848c85543586642ca2;hpb=ab53c66b268d97cd57d9aa9fea94b8fa74383c01 diff --git a/src/rrd_create.c b/src/rrd_create.c index 028123e..6d7cb18 100644 --- a/src/rrd_create.c +++ b/src/rrd_create.c @@ -232,6 +232,7 @@ int rrd_create_r( char *argvcopy; char *tokptr; size_t old_size = sizeof(rra_def_t) * (rrd.stat_head->rra_cnt); + int row_cnt; if ((rrd.rra_def = rrd_realloc(rrd.rra_def, old_size + sizeof(rra_def_t))) == @@ -312,8 +313,10 @@ int rrd_create_r( case CF_SEASONAL: case CF_DEVPREDICT: case CF_FAILURES: - rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = - atoi(token); + row_cnt = atoi(token); + rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt; + if (row_cnt <= 0) + rrd_set_error("Invalid row count: %i", row_cnt); break; default: rrd.rra_def[rrd.stat_head->rra_cnt]. @@ -416,8 +419,10 @@ int rrd_create_r( ("Unexpected extra argument for consolidation function DEVPREDICT"); break; default: - rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = - atoi(token); + row_cnt = atoi(token); + rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt; + if (row_cnt <= 0) + rrd_set_error("Invalid row count: %i", row_cnt); break; } break;