[or-cvs] r11865: backport r11864 (in tor/branches/tor-0_1_2-patches: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-10-10 23:30:15 -0400 (Wed, 10 Oct 2007)
New Revision: 11865

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/control.c
Log:
backport r11864


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-10-11 03:27:47 UTC (rev 11864)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-10-11 03:30:15 UTC (rev 11865)
@@ -12,6 +12,8 @@
       bug 467.)
     - Fix a user-triggerable segfault in expand_filename().  (There isn't
       a way to trigger this remotely.)
+    - Fix a minor memory leak whenever a controller sends the PROTOCOLINFO
+      command. Bugfix on 0.1.2.17.
 
   o Minor bugfixes (controller):
     - When sending a status event to the controller telling it that an

Modified: tor/branches/tor-0_1_2-patches/src/or/control.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/control.c	2007-10-11 03:27:47 UTC (rev 11864)
+++ tor/branches/tor-0_1_2-patches/src/or/control.c	2007-10-11 03:30:15 UTC (rev 11865)
@@ -2268,6 +2268,7 @@
                              cookies?" COOKIEFILE=":"",
                              cookies?esc_cfile:"",
                              escaped(VERSION));
+    tor_free(methods);
     tor_free(cfile);
     tor_free(esc_cfile);
   }