aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2017-02-25 01:06:25 -0500
committerWladimir J. van der Laan <laanwj@gmail.com>2017-02-28 11:40:50 +0100
commit775cf54d0e0ad97e043e46fd88018ed6e0bd2684 (patch)
treeba6e9f8eac91bc7198bc7485300fb1f4f38cd6da
parent69832aaad53c9236062ad89c28ad5f28b359b448 (diff)
downloadbitcoin-775cf54d0e0ad97e043e46fd88018ed6e0bd2684.tar.xz
prevector: assert successful allocation
Github-Pull: #9856 Rebased-From: d4ee7baef729da5e18b5e5c3d6ddb5b97df8d4e4
-rw-r--r--src/prevector.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/prevector.h b/src/prevector.h
index 6b2f578f5c..cba2e30057 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -5,6 +5,7 @@
#ifndef _BITCOIN_PREVECTOR_H_
#define _BITCOIN_PREVECTOR_H_
+#include <assert.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
@@ -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<char*>(realloc(_union.indirect, ((size_t)sizeof(T)) * new_capacity));
+ assert(_union.indirect);
_union.capacity = new_capacity;
} else {
char* new_indirect = static_cast<char*>(malloc(((size_t)sizeof(T)) * new_capacity));
+ assert(new_indirect);
T* src = direct_ptr(0);
T* dst = reinterpret_cast<T*>(new_indirect);
memcpy(dst, src, size() * sizeof(T));