tor

commit ef345ab56d26e51f5d1f1a0b51e55a589465669b
parent 9be65c440baae43dd38ffef216f6198c714ba5ba
Author: teor <teor@torproject.org>
Date:   Mon, 12 Aug 2019 09:42:15 +1000

Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5

Diffstat:
A
changes/bug30148
 | 
4
++++
M
src/feature/relay/routerkeys.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug30148 b/changes/bug30148
@@ -0,0 +1,4 @@
+  o Minor bugfixes (memory leak):
+    - Avoid a minor memory leak that could occur on relays when
+      creating a keys directory failed. Fixes bug 30148; bugfix on
+      0.3.3.1-alpha.
diff --git a/src/feature/relay/routerkeys.c b/src/feature/relay/routerkeys.c
@@ -188,7 +188,7 @@ load_ed_keys(const or_options_t *options, time_t now)
 
     /* Check/Create the key directory */
     if (create_keys_directory(options) < 0)
-      return -1;
+      goto err;
 
     char *fname;
     if (options->master_key_fname) {