diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-09-17 13:56:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-09-17 13:56:40 -0400 |
| commit | 3ee664bb332f88a64d1daecbca687262872b1364 (patch) | |
| tree | beb3f862b9640de6edf55e5c9aaef36c321dbf65 | |
| parent | ee72c517b2cce9df02000c7c456cea07e3d2f158 (diff) | |
| parent | 47f1d19f8e6e1795ad7a73cb96bf44f355442e85 (diff) | |
| download | tor-3ee664bb332f88a64d1daecbca687262872b1364.tar.gz tor-3ee664bb332f88a64d1daecbca687262872b1364.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/ticket40125 | 4 | ||||
| -rw-r--r-- | src/test/test_rendcache.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket40125 b/changes/ticket40125 new file mode 100644 index 0000000000..c68e3ce7b3 --- /dev/null +++ b/changes/ticket40125 @@ -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. diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 93f9f82953..92e135f3b1 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -978,11 +978,13 @@ test_rend_cache_entry_free(void *data) // Handles NULL descriptor correctly e = tor_malloc_zero(sizeof(rend_cache_entry_t)); + rend_cache_increment_allocation(rend_cache_entry_allocation(e)); rend_cache_entry_free(e); // Handles non-NULL descriptor correctly e = tor_malloc_zero(sizeof(rend_cache_entry_t)); e->desc = tor_malloc(10); + rend_cache_increment_allocation(rend_cache_entry_allocation(e)); rend_cache_entry_free(e); /* done: */ |