aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-08-30 23:20:59 +1000
committerteor <teor@torproject.org>2019-08-30 23:20:59 +1000
commit4662cbec7bd33fee973e467615ab30933138c279 (patch)
tree5c1153aeff21871a8f282079ab99f84ac01aa423
parent190386f1c44462fbef568ca9e3c1c997dbebcf12 (diff)
parent4ab1d1c0c44a887417b04fc75b1b11bf246f2bb5 (diff)
downloadtor-4662cbec7bd33fee973e467615ab30933138c279.tar.gz
tor-4662cbec7bd33fee973e467615ab30933138c279.zip
Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
-rw-r--r--changes/bug308944
-rw-r--r--src/app/config/confparse.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug30894 b/changes/bug30894
new file mode 100644
index 0000000000..64c14c4e6d
--- /dev/null
+++ b/changes/bug30894
@@ -0,0 +1,4 @@
+ o Minor bugfixes (memory leaks):
+ - Fix a trivial memory leak when parsing an invalid value
+ from a download schedule in the configuration. Fixes bug
+ 30894; bugfix on 0.3.4.1-alpha.
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 8681f648da..729e7a4478 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -225,6 +225,7 @@ config_assign_value(const config_format_t *fmt, void *options,
tor_asprintf(msg,
"Interval '%s %s' is malformed or out of bounds.",
c->key, c->value);
+ tor_free(tmp);
return -1;
}
*(int *)lvalue = i;