nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3'

Browse Source
This commit is contained in:
Nick Mathewson 2018-04-24 10:37:36 -04:00
commit ea3c3a10a2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug25901 Normal file
View File

@ -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.

4
src/or/hs_service.c
View File

@ -841,6 +841,10 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service)
/* Let's do a shallow copy */ /* Let's do a shallow copy */
dst->intro_circ_retry_started_time = src->intro_circ_retry_started_time; dst->intro_circ_retry_started_time = src->intro_circ_retry_started_time;
dst->num_intro_circ_launched = src->num_intro_circ_launched; 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; dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie;
src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ src->replay_cache_rend_cookie = NULL; /* steal pointer reference */