X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph_helper.c;h=20198edd97a57b623aa033559383f7e993443029;hb=ec2afe5e94d9fcd72bb58e572f0251c7557325f7;hp=d6411a06ef64429c8892abcbc42c3e891ccb3e88;hpb=b6076fdcf6de8361144c0d49c0b61623b5b26342;p=rrdtool.git diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c index d6411a0..20198ed 100644 --- a/src/rrd_graph_helper.c +++ b/src/rrd_graph_helper.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.2.13 Copyright by Tobi Oetiker, 1997-2006 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 **************************************************************************** * rrd_graph_helper.c commandline parser functions * this code initially written by Alex van den Bogaerdt @@ -133,6 +133,10 @@ rrd_parse_find_gf(const char *const line, unsigned int *const eaten, graph_desc_ rrd_set_error("Malformed '%s' command in line '%s'\n",&line[*eaten],line); return 1; } + if (line[*eaten] == '\0') { + rrd_set_error("Expected some arguments after '%s'\n",line); + return 1; + } return 0; } @@ -629,7 +633,7 @@ rrd_parse_def(const char *const line, unsigned int *const eaten, graph_desc_t *c dprintf("- from line '%s'\n",line); if (rrd_parse_make_vname(line,eaten,gdp,im)) return 1; - i=scan_for_col(&line[*eaten],254,gdp->rrd); + i=scan_for_col(&line[*eaten],sizeof(gdp->rrd)-1,gdp->rrd); if (line[*eaten+i]!=':') { rrd_set_error("Problems reading database name"); return 1;