nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.0'

Browse Source
This commit is contained in:
Nick Mathewson 2017-03-13 16:22:54 -04:00
commit d9cd4b7072
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug21682 Normal file
View File

@ -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.

1
src/or/confparse.c
View File

@ -779,6 +779,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
tor_free(result); tor_free(result);
return NULL; return NULL;
case CONFIG_TYPE_LINELIST_S: case CONFIG_TYPE_LINELIST_S:
tor_free(result->key);
tor_free(result); tor_free(result);
result = config_lines_dup_and_filter(*(const config_line_t **)value, result = config_lines_dup_and_filter(*(const config_line_t **)value,
key); key);