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

Merge branch 'maint-0.4.3' into maint-0.4.4

Browse Source
This commit is contained in:
Nick Mathewson 2020-09-17 13:56:40 -04:00
commit 54cd2578ef
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40125 Normal file
View File

@ -0,0 +1,4 @@
o Testing (onion service v2):
- Fix a rendezvous cache unit test that was triggering an underflow on the
global rend cache allocation. Fixes bug 40125; bugfix on
0.2.8.1-alpha.

2
src/test/test_rendcache.c
View File

@ -974,11 +974,13 @@ test_rend_cache_entry_free(void *data)
// Handles NULL descriptor correctly // Handles NULL descriptor correctly
e = tor_malloc_zero(sizeof(rend_cache_entry_t)); e = tor_malloc_zero(sizeof(rend_cache_entry_t));
rend_cache_increment_allocation(rend_cache_entry_allocation(e));
rend_cache_entry_free(e); rend_cache_entry_free(e);
// Handles non-NULL descriptor correctly // Handles non-NULL descriptor correctly
e = tor_malloc_zero(sizeof(rend_cache_entry_t)); e = tor_malloc_zero(sizeof(rend_cache_entry_t));
e->desc = tor_malloc(10); e->desc = tor_malloc(10);
rend_cache_increment_allocation(rend_cache_entry_allocation(e));
rend_cache_entry_free(e); rend_cache_entry_free(e);
/* done: */ /* done: */