X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_create.c;h=edba9b8364d9a21299cd0c329ee097d7cfd7c87e;hb=d38f649c3e9f0dbfbd80a86eb94ef7970e4a376c;hp=6d7cb18e977af78a55a2afc55069d5923e1084d8;hpb=0cc0426da39afd7d41a8f3848c85543586642ca2;p=rrdtool.git

diff --git a/src/rrd_create.c b/src/rrd_create.c
index 6d7cb18..edba9b8 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3rc9  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_create.c  creates new rrds
  *****************************************************************************/
@@ -314,9 +314,9 @@ int rrd_create_r(
                     case CF_DEVPREDICT:
                     case CF_FAILURES:
                         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);
+                        rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt;
                         break;
                     default:
                         rrd.rra_def[rrd.stat_head->rra_cnt].
@@ -373,6 +373,8 @@ int rrd_create_r(
                     default:
                         rrd.rra_def[rrd.stat_head->rra_cnt].pdp_cnt =
                             atoi(token);
+                        if (atoi(token) < 1)
+                            rrd_set_error("Invalid step: must be >= 1");
                         break;
                     }
                     break;
@@ -420,9 +422,9 @@ int rrd_create_r(
                         break;
                     default:
                         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);
+                        rrd.rra_def[rrd.stat_head->rra_cnt].row_cnt = row_cnt;
                         break;
                     }
                     break;