diff --git a/program/src/rrd_cgi.c b/program/src/rrd_cgi.c
index 5a72d27900191f3d3f4400241f3fd3384949824c..1c5d6e48fb21234e0e9832976f4041a65af245a6 100644 (file)
--- a/program/src/rrd_cgi.c
+++ b/program/src/rrd_cgi.c
/*****************************************************************************
- * RRDtool 1.2.24 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.2.30 Copyright by Tobi Oetiker, 1997-2009
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
if (calcpr) {
free(calcpr);
}
+ calcpr=NULL;
}
}
char *err = malloc((strlen(rrd_get_error())+DS_NAM_SIZE)*sizeof(char));
sprintf(err, "[ERROR: %s]",rrd_get_error());
rrd_clear_error();
- calfree();
return err;
}
}
if (i<numargs) {
/* try to find out if there's already such a variable */
- for (k=0; k<i && (strncmp (result[k]->name,cp, esp-cp) || !(strlen (result[k]->name) == esp-cp)); k++);
+ for (k=0; k<i && (strncmp (result[k]->name,cp, esp-cp) || !(strlen (result[k]->name) == (size_t)(esp-cp))); k++);
if (k == i) { /* No such variable yet */
if ((result[i] = (s_var *)malloc(sizeof(s_var))) == NULL)