From: Matthias Runge <mrunge@redhat.com>
Date: Tue, 17 Dec 2019 14:35:57 +0000 (+0100)
Subject: Merge pull request #3353 from mrunge/master
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=071568a48ad7b4fff84e40cb0c3c25ef17ab61ae;hp=e95e850a1688e6bee4ee87b27f92f2a4ffaf7a91

Merge pull request #3353 from mrunge/master

Remove grpc from Mac builds for now
---

diff --git a/src/amqp1.c b/src/amqp1.c
index 67c96b75..4325f001 100644
--- a/src/amqp1.c
+++ b/src/amqp1.c
@@ -572,8 +572,10 @@ static int amqp1_config_instance(oconfig_item_t *ci) /* {{{ */
     else if (strcasecmp("Format", child->key) == 0) {
       char *key = NULL;
       status = cf_util_get_string(child, &key);
-      if (status != 0)
+      if (status != 0) {
+        amqp1_config_instance_free(instance);
         return status;
+      }
       assert(key != NULL);
       if (strcasecmp(key, "Command") == 0) {
         instance->format = AMQP1_FORMAT_COMMAND;
@@ -627,12 +629,14 @@ static int amqp1_config_instance(oconfig_item_t *ci) /* {{{ */
     status = ssnprintf(tpname, sizeof(tpname), "amqp1/%s", instance->name);
     if ((status < 0) || (size_t)status >= sizeof(tpname)) {
       ERROR("amqp1 plugin: Instance name would have been truncated.");
+      amqp1_config_instance_free(instance);
       return -1;
     }
     status = ssnprintf(instance->send_to, sizeof(instance->send_to), "/%s/%s",
                        transport->address, instance->name);
     if ((status < 0) || (size_t)status >= sizeof(instance->send_to)) {
       ERROR("amqp1 plugin: send_to address would have been truncated.");
+      amqp1_config_instance_free(instance);
       return -1;
     }
     if (instance->notify) {
diff --git a/src/network.c b/src/network.c
index a1a6e3d0..613caa73 100644
--- a/src/network.c
+++ b/src/network.c
@@ -2762,6 +2762,7 @@ network_config_set_bind_address(const oconfig_item_t *ci,
   *bind_address = malloc(sizeof(**bind_address));
   if (*bind_address == NULL) {
     ERROR("network plugin: network_config_set_bind_address: malloc failed.");
+    freeaddrinfo(res);
     return -1;
   }
   (*bind_address)->ss_family = res->ai_family;