Browse Source

don't throw std::bad_alloc when out of memory. Instead, terminate immediately

0.15
Cory Fields 8 years ago
parent
commit
c5f008a416
  1. 16
      src/init.cpp

16
src/init.cpp

@ -797,6 +797,19 @@ ServiceFlags nLocalServices = NODE_NETWORK; @@ -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() @@ -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;
}

Loading…
Cancel
Save