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

Fix memory leak in options_act_reversible: fix Coverity CID 486,487
---

diff --git a/src/or/config.c b/src/or/config.c
index 3080da0485..c5322f5120 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1077,8 +1077,11 @@ options_act_reversible(const or_options_t *old_options, char **msg)
     }
 
     /* Adjust the client port configuration so we can launch listeners. */
-    if (parse_client_ports(options, 0, msg, &n_client_ports))
-      return -1;
+    if (parse_client_ports(options, 0, msg, &n_client_ports)) {
+      if (!*msg)
+        *msg = tor_strdup("Unexpected problem parsing client port config");
+      goto rollback;
+    }
 
     /* Set the hibernation state appropriately.*/
     consider_hibernation(time(NULL));