Merge pull request #27403 from vespa-engine/balder/throw-on-failed-malloc

Throw if allocation failed.

2 files changed, 10 insertions, 3 deletions

diff --git a/vespalib/src/vespa/vespalib/util/alloc.cpp b/vespalib/src/vespa/vespalib/util/alloc.cpp
index cb9a4b688b3..4e04dd20d91 100644
--- a/vespalib/src/vespa/vespalib/util/alloc.cpp
+++ b/vespalib/src/vespa/vespalib/util/alloc.cpp
@@ -291,7 +291,14 @@ HeapAllocator::alloc(size_t sz) const {
 
 PtrAndSize
 HeapAllocator::salloc(size_t sz) {
-    return PtrAndSize((sz > 0) ? malloc(sz) : nullptr, sz);
+    if (sz == 0) {
+        return PtrAndSize(nullptr, sz);
+    }
+    void * ptr = malloc(sz);
+    if (ptr == nullptr) {
+        throw OOMException(make_string("malloc(%zu) failed with error '%s'", sz, getLastErrorString().c_str()));
+    }
+    return PtrAndSize(ptr, sz);
 }
 
 void HeapAllocator::free(PtrAndSize alloc) const {
diff --git a/vespalib/src/vespa/vespalib/util/exceptions.cpp b/vespalib/src/vespa/vespalib/util/exceptions.cpp
index 5bb85d1e275..45f63bf56fa 100644
--- a/vespalib/src/vespa/vespalib/util/exceptions.cpp
+++ b/vespalib/src/vespa/vespalib/util/exceptions.cpp
@@ -55,8 +55,8 @@ ExceptionWithPayload::ExceptionWithPayload(ExceptionWithPayload &&) noexcept = d
 ExceptionWithPayload & ExceptionWithPayload::operator = (ExceptionWithPayload &&) noexcept = default;
 ExceptionWithPayload::~ExceptionWithPayload() = default;
 
-SilenceUncaughtException::SilenceUncaughtException(const std::exception & e) :
-    _oldTerminate(std::set_terminate(silent_terminate))
+SilenceUncaughtException::SilenceUncaughtException(const std::exception & e)
+    : _oldTerminate(std::set_terminate(silent_terminate))
 {
     std::lock_guard<std::mutex> guard(_G_silence_mutex);
     _G_what = e.what();