Commit 9187cdb1 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2

parents d2951b38 b259008c

changes/bug25901

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/or/hs_service.c

+4 −0
Original line number Diff line number Diff line
@@ -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 */