From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 21 Jul 2017 19:09:58 +0000 (+0200)
Subject: Merge pull request #2375 from rpv-tomsk/small-fix
X-Git-Tag: collectd-5.6.3~10
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=b8530b9cf75a0b560fdef94f2b80fbe50c22f9c5;hp=2739b2c65f22e459d947bdd10cb9a9807ca729e8

Merge pull request #2375 from rpv-tomsk/small-fix

network: Fix free() before use
---

diff --git a/src/network.c b/src/network.c
index 2ff09af3..fbb42fcb 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1230,9 +1230,9 @@ static int parse_part_encr_aes256(sockent_t *se, /* {{{ */
                             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);
   }
 
@@ -1254,8 +1254,6 @@ static int parse_part_encr_aes256(sockent_t *se, /* {{{ */
   parse_packet(se, buffer + buffer_offset, payload_len, flags | PP_ENCRYPTED,
                pea.username);
 
-  /* XXX: Free pea.username?!? */
-
   /* Update return values */
   *ret_buffer = buffer + part_size;
   *ret_buffer_len = buffer_len - part_size;