nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.7'

Browse Source
This commit is contained in:
Nick Mathewson 2015-10-21 10:54:12 -04:00
commit d14b009b23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug17402 Normal file
View File

@ -0,0 +1,3 @@
o Major bugfixes (memory leak):
- Fix a memory leak in rend_cache_failure_entry_free().
Fixes bug 17402; bugfix on 0.2.7.3-rc.

14
src/or/rendcache.c
View File

@ -127,6 +127,12 @@ rend_cache_failure_intro_entry_free(rend_cache_failure_intro_t *entry)
tor_free(entry);
}
static void
rend_cache_failure_intro_entry_free_(void *entry)
{
rend_cache_failure_intro_entry_free_(entry);
}
/** Allocate a rend cache failure intro object and return it. <b>failure</b>
* is set into the object. This function can not fail. */
STATIC rend_cache_failure_intro_t *
@ -147,11 +153,9 @@ rend_cache_failure_entry_free(rend_cache_failure_t *entry)
}
/* Free and remove every intro failure object. */
DIGESTMAP_FOREACH_MODIFY(entry->intro_failures, key,
rend_cache_failure_intro_t *, e) {
rend_cache_failure_intro_entry_free(e);
MAP_DEL_CURRENT(key);
} DIGESTMAP_FOREACH_END;
digestmap_free(entry->intro_failures,
rend_cache_failure_intro_entry_free_);
tor_free(entry);
}