[tor-commits] [tor/release-0.3.2] hs: Fix memleak in v3 on SIGHUP

[nickm at torproject.org]

commit b259008c56c44c32dfeea3ed8d4b06cd61751a88
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Apr 23 11:09:57 2018 -0400

    hs: Fix memleak in v3 on SIGHUP
    
    Fixes #25901
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 changes/bug25901    | 3 +++
 src/or/hs_service.c | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug25901 b/changes/bug25901
new file mode 100644
index 000000000..3ad30c767
--- /dev/null
+++ 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
index 45810c5c5..8ddd68c69 100644
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -840,6 +840,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 */