From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 May 2015 16:47:31 +0000 (-0400)
Subject: Fix memory leak on failure to generate EI. CID 1301370.
X-Git-Tag: tor-0.2.7.2-alpha~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a85d58af62b04f37e16e2840e77e7f158a9586fc;p=thirdparty%2Ftor.git

Fix memory leak on failure to generate EI. CID 1301370.
---

diff --git a/src/or/router.c b/src/or/router.c
index 6532f97d24..6868e7b996 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2882,7 +2882,6 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo,
                extrainfo->nickname, identity,
                ed_cert_line,
                published, bandwidth_usage);
-  tor_free(bandwidth_usage);
   smartlist_add(chunks, pre);
 
   if (geoip_is_loaded(AF_INET))
@@ -3030,6 +3029,7 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo,
   tor_free(s_dup);
   tor_free(ed_cert_line);
   extrainfo_free(ei_tmp);
+  tor_free(bandwidth_usage);
 
   return result;
 }