diff options
author | Matt Corallo <matt@bluematt.me> | 2012-01-03 00:03:07 -0800 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-05 12:11:28 -0500 |
commit | 99e9601e805c009b301c7cb29d541858507ae095 (patch) | |
tree | 8d8b4dc938b3e1ed7a0e6ff84aa04531f9ad7f33 /src/serialize.h | |
parent | cc6bd19660461091903568803014b39d571fd458 (diff) | |
download | bitcoin-99e9601e805c009b301c7cb29d541858507ae095.tar.xz |
Fix horrific performance found by gmaxwell.
Diffstat (limited to 'src/serialize.h')
-rw-r--r-- | src/serialize.h | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/src/serialize.h b/src/serialize.h index 7876990d04..b0ce065297 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -828,6 +828,38 @@ struct secure_allocator : public std::allocator<T> }; +// +// Allocator that clears its contents before deletion. +// +template<typename T> +struct zero_after_free_allocator : public std::allocator<T> +{ + // MSVC8 default copy constructor is broken + typedef std::allocator<T> base; + typedef typename base::size_type size_type; + typedef typename base::difference_type difference_type; + typedef typename base::pointer pointer; + typedef typename base::const_pointer const_pointer; + typedef typename base::reference reference; + typedef typename base::const_reference const_reference; + typedef typename base::value_type value_type; + zero_after_free_allocator() throw() {} + zero_after_free_allocator(const zero_after_free_allocator& a) throw() : base(a) {} + template <typename U> + zero_after_free_allocator(const zero_after_free_allocator<U>& a) throw() : base(a) {} + ~zero_after_free_allocator() throw() {} + template<typename _Other> struct rebind + { typedef zero_after_free_allocator<_Other> other; }; + + void deallocate(T* p, std::size_t n) + { + if (p != NULL) + memset(p, 0, sizeof(T) * n); + std::allocator<T>::deallocate(p, n); + } +}; + + // // Double ended buffer combining vector and stream-like interfaces. @@ -837,7 +869,7 @@ struct secure_allocator : public std::allocator<T> class CDataStream { protected: - typedef std::vector<char, secure_allocator<char> > vector_type; + typedef std::vector<char, zero_after_free_allocator<char> > vector_type; vector_type vch; unsigned int nReadPos; short state; |