Merge branch 'collectd-4.10' into collectd-5.3

diff --git a/src/plugin.c b/src/plugin.c
index d3767d1..ed962a7 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -332,7 +332,7 @@ static int plugin_load_file (char *file, uint32_t flags)
 
                ssnprintf (errbuf, sizeof (errbuf),
                                "lt_dlopen (\"%s\") failed: %s. "
-                               "The most common cause for this problem are "
+                               "The most common cause for this problem is "
                                "missing dependencies. Use ldd(1) to check "
                                "the dependencies of the plugin "
                                "/ shared object.",

diff --git a/src/snmp.c b/src/snmp.c
index 3e6cb91..7d340d1 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1316,6 +1316,8 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
         snmp_free_pdu (res);
       res = NULL;
 
+      /* snmp_synch_response already freed our PDU */
+      req = NULL;
       sfree (errstr);
       csnmp_host_close_session (host);