diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-13 16:22:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-13 16:22:49 -0400 |
| commit | 0c58627c1cb134d57bb653007d67d9c4a8119faa (patch) | |
| tree | 8d7139f05c22905fb0b64162bcdd5b08ef0c5117 | |
| parent | 51ae5d84402348702f9244245c098923e8580d3b (diff) | |
| parent | e2cd600da6e99c38193a6bd326b4208b1fc380d8 (diff) | |
| download | tor-0c58627c1cb134d57bb653007d67d9c4a8119faa.tar.gz tor-0c58627c1cb134d57bb653007d67d9c4a8119faa.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -rw-r--r-- | changes/bug21682 | 3 | ||||
| -rw-r--r-- | src/or/confparse.c | 1 |
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); |