summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-06-26 10:51:50 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2019-06-26 10:51:50 +0300
commit8c77a9444afbc9944b15d94e388fd126c2a9b9ed (patch)
treeb87945bfb0f93a02deb05079343d1d9e43715e29
parentd13db36d84a31bba9af845faac1edf4ffc7c7145 (diff)
parent00acccac644c20803d11ef7e162ae327eb834cf7 (diff)
downloadtor-8c77a9444afbc9944b15d94e388fd126c2a9b9ed.tar.gz
tor-8c77a9444afbc9944b15d94e388fd126c2a9b9ed.zip
Merge branch 'maint-0.4.1' into release-0.4.1
-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;