From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Oct 2011 16:57:07 +0000 (-0400)
Subject: Fix memory leak in retry_all_listeners: Coverity CID 485
X-Git-Tag: tor-0.2.3.6-alpha~8^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1632c3fb742f94a6ce0de201653a8c4a9d2887f;p=thirdparty%2Ftor.git

Fix memory leak in retry_all_listeners: Coverity CID 485
---

diff --git a/src/or/connection.c b/src/or/connection.c
index af0572905d..bf39a5cb9c 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1988,13 +1988,13 @@ retry_all_listeners(smartlist_t *replaced_conns,
                       options->ControlListenAddress,
                       options->ControlPort, "127.0.0.1",
                       new_conns, 0) < 0)
-    return -1;
+    retval = -1;
   if (retry_listeners(listeners,
                       CONN_TYPE_CONTROL_LISTENER,
                       options->ControlSocket,
                       options->ControlSocket ? 1 : 0, NULL,
                       new_conns, 1) < 0)
-    return -1;
+    retval = -1;
 
   /* Any members that were still in 'listeners' don't correspond to
    * any configured port.  Kill 'em. */