Merge branch 'collectd-5.5'

[collectd.git] / src / snmp.c

diff --git a/src/snmp.c b/src/snmp.c
index 23aefd5..3ccf60c 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1108,11 +1108,11 @@ static int csnmp_strvbcopy (char *dst, /* {{{ */
     src = (char *) vb->val.bitstring;
   else if (vb->type == ASN_IPADDRESS)
   {
-    return ssnprintf (dst, dst_size, "%d.%d.%d.%d",
-          (uint8_t)vb->val.string[0],
-          (uint8_t)vb->val.string[1],
-          (uint8_t)vb->val.string[2],
-          (uint8_t)vb->val.string[3]);
+    return ssnprintf (dst, dst_size, "%"PRIu8".%"PRIu8".%"PRIu8".%"PRIu8"",
+          (uint8_t) vb->val.string[0],
+          (uint8_t) vb->val.string[1],
+          (uint8_t) vb->val.string[2],
+          (uint8_t) vb->val.string[3]);
   }
   else
   {
@@ -1398,7 +1398,7 @@ static int csnmp_dispatch_table (host_definition_t *host, data_definition_t *dat
 static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
 {
   struct snmp_pdu *req;
-  struct snmp_pdu *res;
+  struct snmp_pdu *res = NULL;
   struct variable_list *vb;
 
   const data_set_t *ds;
@@ -1755,6 +1755,7 @@ static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
     res = NULL;
 
     sfree (errstr);
+    sfree (vl.values);
     csnmp_host_close_session (host);
 
     return (-1);