diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:45:46 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:45:46 -0500 |
commit | 9ad4776e6150a29fdfff607721599eb04c6e76d7 (patch) | |
tree | 7189ed200ae8f47bf7d3399d0b99243dc93bced3 /src/common/mempool.c | |
parent | 758428dd32128874cefacc92ef63c1b5bc9a656e (diff) | |
parent | 49dd5ef3a3d1775fdc3c0a7d069d3097b3baeeec (diff) | |
download | tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.tar.gz tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.zip |
Merge branch 'bug7352_023_rebased' into maint-0.2.3
Diffstat (limited to 'src/common/mempool.c')
-rw-r--r-- | src/common/mempool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/mempool.c b/src/common/mempool.c index 2416bce473..637f081c88 100644 --- a/src/common/mempool.c +++ b/src/common/mempool.c @@ -8,6 +8,7 @@ #include <stdlib.h> #include <string.h> #include "torint.h" +#include "crypto.h" #define MEMPOOL_PRIVATE #include "mempool.h" @@ -519,7 +520,7 @@ mp_pool_destroy(mp_pool_t *pool) destroy_chunks(pool->empty_chunks); destroy_chunks(pool->used_chunks); destroy_chunks(pool->full_chunks); - memset(pool, 0xe0, sizeof(mp_pool_t)); + memwipe(pool, 0xe0, sizeof(mp_pool_t)); FREE(pool); } |