From c5f008a4166bae4350881a74fc04a87d7a5c4ed5 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Fri, 24 Feb 2017 18:20:03 -0500 Subject: don't throw std::bad_alloc when out of memory. Instead, terminate immediately --- src/init.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src') diff --git a/src/init.cpp b/src/init.cpp index 196b840cb7..22c8974a59 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -797,6 +797,19 @@ ServiceFlags nLocalServices = NODE_NETWORK; } +[[noreturn]] static void new_handler_terminate() +{ + // Rather than throwing std::bad-alloc if allocation fails, terminate + // immediately to (try to) avoid chain corruption. + // Since LogPrintf may itself allocate memory, set the handler directly + // to terminate first. + std::set_new_handler(std::terminate); + LogPrintf("Error: Out of memory. Terminating.\n"); + + // The log was successful, terminate now. + std::terminate(); +}; + bool AppInitBasicSetup() { // ********************************************************* Step 1: setup @@ -849,6 +862,9 @@ bool AppInitBasicSetup() // Ignore SIGPIPE, otherwise it will bring the daemon down if the client closes unexpectedly signal(SIGPIPE, SIG_IGN); #endif + + std::set_new_handler(new_handler_terminate); + return true; } -- cgit v1.2.3