projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0be68f
)
src/common.c: parse_identifier_vl: Don't pass NULL to sstrncpy().
author
Florian Forster
<octo@huhu.verplant.org>
Sun, 2 Jan 2011 21:20:14 +0000
(22:20 +0100)
committer
Florian Forster
<octo@huhu.verplant.org>
Sun, 2 Jan 2011 21:20:14 +0000
(22:20 +0100)
src/common.c
patch
|
blob
|
history
diff --git
a/src/common.c
b/src/common.c
index
7813d5b
..
142d797
100644
(file)
--- a/
src/common.c
+++ b/
src/common.c
@@
-941,9
+941,13
@@
int parse_identifier_vl (const char *str, value_list_t *vl) /* {{{ */
sstrncpy (vl->host, host, sizeof (host));
sstrncpy (vl->plugin, plugin, sizeof (plugin));
sstrncpy (vl->host, host, sizeof (host));
sstrncpy (vl->plugin, plugin, sizeof (plugin));
- sstrncpy (vl->plugin_instance, plugin_instance, sizeof (plugin_instance));
+ sstrncpy (vl->plugin_instance,
+ (plugin_instance != NULL) ? plugin_instance : "",
+ sizeof (plugin_instance));
sstrncpy (vl->type, type, sizeof (type));
sstrncpy (vl->type, type, sizeof (type));
- sstrncpy (vl->type_instance, type_instance, sizeof (type_instance));
+ sstrncpy (vl->type_instance,
+ (type_instance != NULL) ? type_instance : "",
+ sizeof (type_instance));
return (0);
} /* }}} int parse_identifier_vl */
return (0);
} /* }}} int parse_identifier_vl */