Throw if allocation failed.

1 files changed, 8 insertions, 1 deletions

diff --git a/vespalib/src/vespa/vespalib/util/alloc.cpp b/vespalib/src/vespa/vespalib/util/alloc.cpp
index cb9a4b688b3..b8b790254bd 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 IllegalArgumentException(make_string("malloc(%zu) failed with error '%s'", sz, getLastErrorString().c_str()));
+    }
+    return PtrAndSize(ptr, sz);
 }
 
 void HeapAllocator::free(PtrAndSize alloc) const {