X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=2068b6fbba943a4129b731f38e3a520b8307e505;hb=a6d79528b4812e8eb3927dba3cdd42e6ca51b287;hp=bb82c38fc3deb6a91a30dca1efa468422582353d;hpb=a23d669b0e20649182eea50c4d13b509fa9d6a4a;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index bb82c38..2068b6f 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.19 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.22 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -689,8 +689,8 @@ int HandleInputLine(int argc, char **argv, FILE* out) char **legend_v; int enumds = 0; int i; - char *vtag = NULL; - vtag = malloc( strlen(COL_DATA_TAG)+10); + size_t vtag_s = strlen(COL_DATA_TAG) + 10; + char *vtag = malloc(vtag_s); for ( i = 2; i < argc; i++){ if (strcmp("--enumds", argv[i]) == 0) enumds = 1; @@ -724,9 +724,9 @@ int HandleInputLine(int argc, char **argv, FILE* out) for (j = 0; j < col_cnt; j++) { rrd_value_t newval = DNAN; if (enumds == 1) - snprintf(vtag,sizeof(vtag),"%s%lu", COL_DATA_TAG, j); + snprintf(vtag,vtag_s,"%s%lu", COL_DATA_TAG, j); else - snprintf(vtag,sizeof(vtag),"%s",COL_DATA_TAG); + snprintf(vtag,vtag_s,"%s",COL_DATA_TAG); newval = *ptr; if(isnan(newval)){