diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-24 10:37:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-24 10:37:36 -0400 |
| commit | 7e7b052b2a114900b5e6575fd5375dc00c09d5db (patch) | |
| tree | d5b80a744122ea6cdde2f8ba16ebe486a515b5c5 /src/or/hs_service.c | |
| parent | 6182f60f758f85a214a7e84d76f6fddb2bffd730 (diff) | |
| parent | 9187cdb1cd17dd988c6e444705c6153a65948f1e (diff) | |
| download | tor-7e7b052b2a114900b5e6575fd5375dc00c09d5db.tar.gz tor-7e7b052b2a114900b5e6575fd5375dc00c09d5db.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/or/hs_service.c')
| -rw-r--r-- | src/or/hs_service.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 6fa9ec6b16..7df8027882 100644 --- 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 */ |