From: Florian Forster <octo@collectd.org>
Date: Thu, 21 Sep 2017 15:26:23 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~90
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1b10ab706f8b70ce2f086e59a54cc09d671ad989;p=collectd.git

Merge branch 'collectd-5.7'
---

1b10ab706f8b70ce2f086e59a54cc09d671ad989
diff --cc src/network.c
index 375da847,e28316d5..4e684215
--- a/src/network.c
+++ b/src/network.c
@@@ -1230,10 -1230,10 +1230,10 @@@ static int parse_part_encr_aes256(socke
                              part_size - buffer_offset,
                              /* in = */ NULL, /* in len = */ 0);
    if (err != 0) {
-     sfree(pea.username);
      ERROR("network plugin: gcry_cipher_decrypt returned: %s. Username: %s",
            gcry_strerror(err), pea.username);
+     sfree(pea.username);
 -    return (-1);
 +    return -1;
    }
  
    /* Read the hash */