X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsnmp.c;h=74068ec3d3dbf210a0be6e69bb2832abb17f699f;hb=e21b137ec98244a6dc8da6898504ec3763a2ce13;hp=6e26ad59da4b2b05da4e8813754392fa66d3c43e;hpb=d16c24542b2f96a194d43a73c2e5778822b9cb47;p=collectd.git diff --git a/src/snmp.c b/src/snmp.c index 6e26ad59..74068ec3 100644 --- a/src/snmp.c +++ b/src/snmp.c @@ -706,11 +706,11 @@ static int csnmp_config_add_host(oconfig_item_t *ci) { ssnprintf(cb_name, sizeof(cb_name), "snmp-%s", hd->name); - user_data_t ud = {.data = hd, .free_func = csnmp_host_definition_destroy}; - - status = - plugin_register_complex_read(/* group = */ NULL, cb_name, csnmp_read_host, - hd->interval, /* user_data = */ &ud); + status = plugin_register_complex_read( + /* group = */ NULL, cb_name, csnmp_read_host, hd->interval, + &(user_data_t){ + .data = hd, .free_func = csnmp_host_definition_destroy, + }); if (status != 0) { ERROR("snmp plugin: Registering complex read function failed."); csnmp_host_definition_destroy(hd); @@ -1363,8 +1363,11 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) { } res = NULL; - /* snmp_sess_synch_response always frees our req PDU */ status = snmp_sess_synch_response(host->sess_handle, req, &res); + + /* snmp_sess_synch_response always frees our req PDU */ + req = NULL; + if ((status != STAT_SUCCESS) || (res == NULL)) { char *errstr = NULL;