Bugfix on r11138:

Fix a minor memory leak whenever a controller sends the PROTOCOLINFO
command. Bugfix on 0.2.0.5-alpha.
Backport candidate.

svn:r11864

diff --git a/ChangeLog b/ChangeLog
index bbbb83235cfb5dda3ac3303d604d18f4a2a5e372..94299aae854f366885d1dd0f6fa271ec4b8288a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,8 @@ Changes in version 0.2.0.8-alpha - 2007-10-12
       file. Bugfix on 0.2.0.7-alpha.
     - Fix a minor memory leak whenever we wrote out a file. Bugfix on
       0.2.0.7-alpha.
+    - Fix a minor memory leak whenever a controller sends the PROTOCOLINFO
+      command. Bugfix on 0.2.0.5-alpha.
 
   o Code simplifications and refactoring:
     - Make a bunch of functions static.  Remove some dead code.

diff --git a/src/or/control.c b/src/or/control.c
index 5b39d586b1079980bc98fd30974f94c34543130a..81fc04f53c745e91fa913f55008a1877ce8f13a2 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2456,6 +2456,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len,
                              cookies?" COOKIEFILE=":"",
                              cookies?esc_cfile:"",
                              escaped(VERSION));
+    tor_free(methods);
     tor_free(cfile);
     tor_free(esc_cfile);
   }