From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 27 Oct 2009 03:13:29 +0000 (-0400)
Subject: Fix an accidentally removed free in 385853a282138a61, and repair a check.
X-Git-Tag: tor-0.2.2.6-alpha~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=311315e077d193e680e0e7de98e28a9d10bcb002;p=thirdparty%2Ftor.git

Fix an accidentally removed free in 385853a282138a61, and repair a check.
---

diff --git a/src/or/control.c b/src/or/control.c
index 7bc8fa7ae0..009994302e 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -853,13 +853,14 @@ handle_control_loadconf(control_connection_t *conn, uint32_t len,
     break;
   }
   if (msg) {
-    if (*errstring)
+    if (errstring)
       connection_printf_to_buf(conn, "%s: %s\r\n", msg, errstring);
     else
       connection_printf_to_buf(conn, "%s\r\n", msg);
   } else {
     send_control_done(conn);
   }
+  tor_free(errstring);
   return 0;
 }