Merge pull request #28053 from vespa-engine/balder/assert-that-you-got-memory

Assert that you actually got memory you allocated.

1 files changed, 4 insertions, 0 deletions

diff --git a/vespalib/src/vespa/vespalib/stllike/string.hpp b/vespalib/src/vespa/vespalib/stllike/string.hpp
index e0144ab6f85..3438c6b641a 100644
--- a/vespalib/src/vespa/vespalib/stllike/string.hpp
+++ b/vespalib/src/vespa/vespalib/stllike/string.hpp
@@ -17,8 +17,10 @@ void
 small_string<StackSize>::_reserveBytes(size_type newBufferSize) noexcept {
     if (isAllocated()) {
          _buf = (char *) realloc(_buf, newBufferSize);
+         assert(_buf);
     } else {
         char *tmp = (char *) malloc(newBufferSize);
+        assert(tmp);
         memcpy(tmp, _stack, _sz);
         tmp[_sz] = '\0';
         _buf = tmp;
@@ -96,6 +98,7 @@ void small_string<StackSize>::init_slower(const void *s) noexcept
 {   
     _bufferSize = _sz+1;
     _buf = (char *) malloc(_bufferSize);
+    assert(_buf);
     memcpy(_buf, s, _sz);
     _buf[_sz] = '\0';
 }
@@ -105,6 +108,7 @@ void small_string<StackSize>::appendAlloc(const void * s, size_type addSz) noexc
 {   
     size_type newBufferSize = roundUp2inN(_sz+addSz+1);
     char * buf = (char *) malloc(newBufferSize);
+    assert(buf);
     memcpy(buf, buffer(), _sz);
     if (isAllocated()) {
         free(_buf);