From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Mon, 16 Nov 2009 14:59:51 +0000 (+0000)
Subject: be more diligent in checking the input arguments for rrdtool  update and complain... 
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d92fa11949eb31c2ac038286fde8fab63bffd9c0;p=rrdtool.git

be more diligent in checking the input arguments for rrdtool  update and complain if they are wrong. fix for #243 (and more)
--This line, and those below, will be ignored-

M    trunk/program/src/rrd_update.c
M    branches/1.3/program/src/rrd_update.c


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1973 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/src/rrd_update.c b/src/rrd_update.c
index a6a0435..9526ec2 100644
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -905,12 +905,16 @@ static int parse_ds(
             if (i < tmpl_cnt) {
                 updvals[tmpl_idx[i++]] = p + 1;
             }
+            else {
+                rrd_set_error("found extra data on update argument: %s",p+1);
+                return -1;
+            }                
         }
     }
 
     if (i != tmpl_cnt) {
         rrd_set_error("expected %lu data source readings (got %lu) from %s",
-                      tmpl_cnt - 1, i, input);
+                      tmpl_cnt - 1, i - 1, input);
         return -1;
     }
 
@@ -1039,10 +1043,20 @@ static int update_pdp_prep(
             switch (dst_idx) {
             case DST_COUNTER:
             case DST_DERIVE:
-                for (ii = 0; updvals[ds_idx + 1][ii] != '\0'; ii++) {
-                    if ((updvals[ds_idx + 1][ii] < '0'
-                         || updvals[ds_idx + 1][ii] > '9')
-                        && (ii != 0 && updvals[ds_idx + 1][ii] != '-')) {
+                if ( (   updvals[ds_idx + 1][0] < '0'
+                      || updvals[ds_idx + 1][0] > '9' )
+                     && updvals[ds_idx + 1][0] != '-'
+                     && updvals[ds_idx + 1][0] != 'U'
+                     && updvals[ds_idx + 1][0] == '\0'
+                   ) {
+                    rrd_set_error("not a simple integer: '%s'",
+                                  updvals[ds_idx + 1]);
+                    return -1;
+                }
+                for (ii = 1; updvals[ds_idx + 1][ii] != '\0'; ii++) {
+                    if (    updvals[ds_idx + 1][ii] < '0'
+                         || updvals[ds_idx + 1][ii] > '9'
+                       ) {
                         rrd_set_error("not a simple integer: '%s'",
                                       updvals[ds_idx + 1]);
                         return -1;