Add a constant for the maximum vector allocation (5 Mbyte)

This commit is contained in:
Pieter Wuille 2017-09-06 11:25:03 -07:00
parent c1607b5df4
commit 37d800bea0

View file

@ -25,6 +25,9 @@
static const unsigned int MAX_SIZE = 0x02000000;
/** Maximum amount of memory (in bytes) to allocate at once when deserializing vectors. */
static const unsigned int MAX_VECTOR_ALLOCATE = 5000000;
/**
* Dummy data type to identify deserializing constructors.
*
@ -750,7 +753,7 @@ void Unserialize_impl(Stream& is, prevector<N, T>& v, const V&)
unsigned int nMid = 0;
while (nMid < nSize)
{
nMid += 5000000 / sizeof(T);
nMid += MAX_VECTOR_ALLOCATE / sizeof(T);
if (nMid > nSize)
nMid = nSize;
v.resize_uninitialized(nMid);
@ -830,7 +833,7 @@ void Unserialize_impl(Stream& is, std::vector<T, A>& v, const V&)
unsigned int nMid = 0;
while (nMid < nSize)
{
nMid += 5000000 / sizeof(T);
nMid += MAX_VECTOR_ALLOCATE / sizeof(T);
if (nMid > nSize)
nMid = nSize;
v.resize(nMid);