Attachment #60195 for bug #94508

View | Details | Raw Unified | Return to bug 94508
Collapse All | Expand All




    rrd_t             rrd;
    long              i;
    int               offset;
    char *token, dummychar1[2],dummychar2[2];
    unsigned short token_idx, error_flag, period=0;
    unsigned long hashed_name;


	    switch (sscanf(&argv[i][3],
			DS_NAM_FMT "%1[:]" DST_FMT "%1[:]%n",
			rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,
			dummychar1,
			rrd.ds_def[rrd.stat_head->ds_cnt].dst,
			dummychar2,
			&offset)) {
		case 0:
		case 1:	rrd_set_error("Invalid DS name"); break;

Return to bug 94508

Lines 95-101 Link Here

(-)/tmp/rrdtool-1.2.8/src/rrd_create.c (-3 / +3 lines)
95	rrd_t rrd;	95	rrd_t rrd;
96	long i;	96	long i;
97	int offset;	97	int offset;
98	char *token,dummychar1,dummychar2;	98	char *token, dummychar1[2],dummychar2[2];
99	unsigned short token_idx, error_flag, period=0;	99	unsigned short token_idx, error_flag, period=0;
100	unsigned long hashed_name;	100	unsigned long hashed_name;
101		101
Lines 149-157 Link Here
149	switch (sscanf(&argv[i][3],	149	switch (sscanf(&argv[i][3],
150	DS_NAM_FMT "%1[:]" DST_FMT "%1[:]%n",	150	DS_NAM_FMT "%1[:]" DST_FMT "%1[:]%n",
151	rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,	151	rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam,
152	&dummychar1,	152	dummychar1,
153	rrd.ds_def[rrd.stat_head->ds_cnt].dst,	153	rrd.ds_def[rrd.stat_head->ds_cnt].dst,
154	&dummychar2,	154	dummychar2,
155	&offset)) {	155	&offset)) {
156	case 0:	156	case 0:
157	case 1: rrd_set_error("Invalid DS name"); break;	157	case 1: rrd_set_error("Invalid DS name"); break;