From 60c9b177742cd26c7df3ced140f2a6248d7ecbd7 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 11 Oct 2007 03:30:15 +0000 Subject: [PATCH] backport r11864 svn:r11865 --- ChangeLog | 2 ++ src/or/control.c | 1 + 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 19e86a287..5bc24fb2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ Changes in version 0.1.2.18 - 2007-??-?? 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 diff --git a/src/or/control.c b/src/or/control.c index cb9c23fe8..a8e58aee4 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2268,6 +2268,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); }