summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2021-10-14 19:18:22 +0000
committerAlexander Færøy <ahf@torproject.org>2021-10-14 19:18:22 +0000
commitb93af906c444a71b52105c49239069adf680efad (patch)
tree4a9b4b4e38aa69aa971de2608f504a05d23846f6
parent1ea523c705755df6ed63a4aa0cd548d2990e3fe2 (diff)
parente0a6a0d085e7918f1128d6300aa64361467a0c3f (diff)
downloadtor-b93af906c444a71b52105c49239069adf680efad.tar.gz
tor-b93af906c444a71b52105c49239069adf680efad.zip
Merge remote-tracking branch 'tor-gitlab/mr/456' into main
-rw-r--r--changes/ticket404845
-rw-r--r--src/feature/hs/hs_config.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket40484 b/changes/ticket40484
new file mode 100644
index 0000000000..9a9ffdf448
--- /dev/null
+++ b/changes/ticket40484
@@ -0,0 +1,5 @@
+ o Minor bugfixes (onion service, config):
+ - Fix a memory leak for a small config line string that could occur if the
+ service failed to be configured from file properly. Fixes bug 40484;
+ bugfix on 0.3.2.1-alpha.
+
diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c
index f9f71c78f2..de1f608ddf 100644
--- a/src/feature/hs/hs_config.c
+++ b/src/feature/hs/hs_config.c
@@ -640,6 +640,7 @@ hs_config_service_all(const or_options_t *options, int validate_only)
int rv = config_service(section, options, new_service_list);
config_free_lines(section);
if (rv < 0) {
+ config_free_lines(remaining);
goto err;
}
}