From 775cf54d0e0ad97e043e46fd88018ed6e0bd2684 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Sat, 25 Feb 2017 01:06:25 -0500 Subject: [PATCH] prevector: assert successful allocation Github-Pull: #9856 Rebased-From: d4ee7baef729da5e18b5e5c3d6ddb5b97df8d4e4 --- src/prevector.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/prevector.h b/src/prevector.h index 6b2f578f5..cba2e3005 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -5,6 +5,7 @@ #ifndef _BITCOIN_PREVECTOR_H_ #define _BITCOIN_PREVECTOR_H_ +#include #include #include #include @@ -170,10 +171,15 @@ private: } } else { if (!is_direct()) { + /* FIXME: Because malloc/realloc here won't call new_handler if allocation fails, assert + success. These should instead use an allocator or new/delete so that handlers + are called as necessary, but performance would be slightly degraded by doing so. */ _union.indirect = static_cast(realloc(_union.indirect, ((size_t)sizeof(T)) * new_capacity)); + assert(_union.indirect); _union.capacity = new_capacity; } else { char* new_indirect = static_cast(malloc(((size_t)sizeof(T)) * new_capacity)); + assert(new_indirect); T* src = direct_ptr(0); T* dst = reinterpret_cast(new_indirect); memcpy(dst, src, size() * sizeof(T));