projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
daemon
/
common.c
diff --git
a/src/daemon/common.c
b/src/daemon/common.c
index
53c1f08
..
b28af33
100644
(file)
--- a/
src/daemon/common.c
+++ b/
src/daemon/common.c
@@
-1149,7
+1149,7
@@
int parse_value (const char *value_orig, value_t *ret_value, int ds_type)
}
if (value == endptr) {
}
if (value == endptr) {
- ERROR ("parse_value: Failed to parse string as %s:
%s
.",
+ ERROR ("parse_value: Failed to parse string as %s:
\"%s\"
.",
DS_TYPE_TO_STRING (ds_type), value);
sfree (value);
return -1;
DS_TYPE_TO_STRING (ds_type), value);
sfree (value);
return -1;
@@
-1170,6
+1170,9
@@
int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
char *ptr;
char *saveptr;
char *ptr;
char *saveptr;
+ if ((buffer == NULL) || (vl == NULL) || (ds == NULL))
+ return EINVAL;
+
i = -1;
dummy = buffer;
saveptr = NULL;
i = -1;
dummy = buffer;
saveptr = NULL;