tor

commit 7e7b052b2a114900b5e6575fd5375dc00c09d5db
parent 6182f60f758f85a214a7e84d76f6fddb2bffd730
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 24 Apr 2018 10:37:36 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

Diffstat:
A
changes/bug25901
 | 
3
+++
M
src/or/hs_service.c
 | 
4
++++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/changes/bug25901 b/changes/bug25901
@@ -0,0 +1,3 @@
+  o Minor bugfixes (hidden service v3):
+    - Fix a memory leak when an hidden service v3 is configured and gets a
+      SIGHUP signal. Fixes bug 25901; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
@@ -842,6 +842,10 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service)
   /* Let's do a shallow copy */
   dst->intro_circ_retry_started_time = src->intro_circ_retry_started_time;
   dst->num_intro_circ_launched = src->num_intro_circ_launched;
+  /* Freeing a NULL replaycache triggers an info LD_BUG. */
+  if (dst->replay_cache_rend_cookie != NULL) {
+    replaycache_free(dst->replay_cache_rend_cookie);
+  }
   dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie;
 
   src->replay_cache_rend_cookie = NULL; /* steal pointer reference */