summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-10-11 03:27:47 +0000
committerRoger Dingledine <arma@torproject.org>2007-10-11 03:27:47 +0000
commit541aa7215566c12b3ffcf23afb866fed7824819c (patch)
treecb2fd7c47cb56cb345946af482ec16d0466f5117
parentbab60e5ade38de854eed980d5c397d9cee051792 (diff)
downloadtor-541aa7215566c12b3ffcf23afb866fed7824819c.tar.gz
tor-541aa7215566c12b3ffcf23afb866fed7824819c.zip
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
-rw-r--r--ChangeLog2
-rw-r--r--src/or/control.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bbbb83235c..94299aae85 100644
--- 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 5b39d586b1..81fc04f53c 100644
--- 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);
}