From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Mar 2017 16:47:19 +0000 (-0500)
Subject: Fix an unreachable memory leak.
X-Git-Tag: tor-0.3.1.1-alpha~213^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1418c09fc2609c4c43b0eebb6b6676139573a02;p=thirdparty%2Ftor.git

Fix an unreachable memory leak.

Also add a missing newline.
---

diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index a3006ce0c5..f8cf180402 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -832,14 +832,18 @@ consdiff_gen_diff(smartlist_t *cons1, smartlist_t *cons2,
   smartlist_t *result = smartlist_new();
   smartlist_add_asprintf(result, "%s", ns_diff_version);
   smartlist_add_asprintf(result, "%s %s %s", hash_token,
-      cons1_hash_hex, cons2_hash_hex); smartlist_add_all(result, ed_diff);
+      cons1_hash_hex, cons2_hash_hex);
+  smartlist_add_all(result, ed_diff);
   smartlist_free(ed_diff);
   return result;
 
  error_cleanup:
 
   if (ed_diff) {
+    /* LCOV_EXCL_START -- ed_diff is NULL except in unreachable cases above */
+    SMARTLIST_FOREACH(ed_diff, char *, cp, tor_free(cp));
     smartlist_free(ed_diff);
+    /* LCOV_EXCL_STOP */
   }
 
   return NULL;