summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-08 10:06:48 -0500
committerNick Mathewson <nickm@torproject.org>2017-03-08 10:06:48 -0500
commit27058bd8cb84c523ff5216bababd6c6b7f4f9bfe (patch)
treec966c82e98e82422e241b2b29b9a55c0ea429713
parent552bc39c327624555034df40c3646fb88a6dc85b (diff)
downloadtor-27058bd8cb84c523ff5216bababd6c6b7f4f9bfe.tar.gz
tor-27058bd8cb84c523ff5216bababd6c6b7f4f9bfe.zip
Fix a memory leak in config_get_assigned_option()
This was introducd in 4d83999213712c7 in 0.3.0.3-alpha. This is bug 21682.
-rw-r--r--changes/bug216823
-rw-r--r--src/or/confparse.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug21682 b/changes/bug21682
new file mode 100644
index 0000000000..ab7126e4d6
--- /dev/null
+++ b/changes/bug21682
@@ -0,0 +1,3 @@
+ o Minor bugfixes (memory leaks):
+ - Fix a memory leak when using GETCONF on a port option.
+ Fixes bug 21682; bugfix on 0.3.0.3-alpha.
diff --git a/src/or/confparse.c b/src/or/confparse.c
index 9e352aca27..9b13a91856 100644
--- a/src/or/confparse.c
+++ b/src/or/confparse.c
@@ -779,6 +779,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
tor_free(result);
return NULL;
case CONFIG_TYPE_LINELIST_S:
+ tor_free(result->key);
tor_free(result);
result = config_lines_dup_and_filter(*(const config_line_t **)value,
key);