author | collectd bot <32910397+collectd-bot@users.noreply.github.com> | |
Fri, 17 Nov 2017 14:05:35 +0000 (15:05 +0100) | ||
committer | GitHub <noreply@github.com> | |
Fri, 17 Nov 2017 14:05:35 +0000 (15:05 +0100) |
Automatically merged due to "Automerge" label
src/libcollectdclient/network_buffer.c | patch | blob | history | |
src/ovs_events.c | patch | blob | history | |
src/snmp_agent.c | patch | blob | history |
index 662265d97996d309ef45391dab28079975d2fac6..a0f8cfdc3cfa74ae36d9954ceb1955c993338770 100644 (file)
static int nb_add_values(char **ret_buffer, /* {{{ */
size_t *ret_buffer_len, const lcc_value_list_t *vl) {
+ if ((vl == NULL) || (vl->values_len < 1)) {
+ return EINVAL;
+ }
+
char *packet_ptr;
size_t packet_len;
diff --git a/src/ovs_events.c b/src/ovs_events.c
index afa11997cfc3a1ec8fadd50a29db39c1d0ecd7b3..bf457fdb68ec378c7f8ad1e11179c000baf9674f 100644 (file)
--- a/src/ovs_events.c
+++ b/src/ovs_events.c
ovs_events_config_free();
return -1;
}
- strncpy(ovs_events_ctx.config.ovs_db_serv, service,
- sizeof(ovs_events_ctx.config.ovs_db_serv));
+ sstrncpy(ovs_events_ctx.config.ovs_db_serv, service,
+ sizeof(ovs_events_ctx.config.ovs_db_serv));
sfree(service);
} else if (strcasecmp("Socket", child->key) == 0) {
if (cf_util_get_string_buffer(
diff --git a/src/snmp_agent.c b/src/snmp_agent.c
index 497d157c07a0193479daeda36002d7bdf2aee4ec..948107b5b62eee002c462886d5238368cd8c7adc 100644 (file)
--- a/src/snmp_agent.c
+++ b/src/snmp_agent.c
}
}
- llentry_t *entry = llentry_create(td->name, td);
- if (entry == NULL) {
- snmp_agent_free_table(&td);
- return -ENOMEM;
- }
-
td->instance_index =
c_avl_create((int (*)(const void *, const void *))strcmp);
if (td->instance_index == NULL) {
return -ENOMEM;
}
+ llentry_t *entry = llentry_create(td->name, td);
+ if (entry == NULL) {
+ snmp_agent_free_table(&td);
+ return -ENOMEM;
+ }
llist_append(g_agent->tables, entry);
return 0;