VPP-152: mheap_alloc returns 0 when the requested heap size is too small

[vpp.git] / vppinfra / vppinfra / mheap.c

diff --git a/vppinfra/vppinfra/mheap.c b/vppinfra/vppinfra/mheap.c
index cd8672e..6163d0b 100644 (file)
--- a/vppinfra/vppinfra/mheap.c
+++ b/vppinfra/vppinfra/mheap.c
@@ -874,6 +874,15 @@ void * mheap_alloc_with_flags (void * memory, uword memory_size, uword flags)
     h = uword_to_pointer (ah, void *);
     v = mheap_vector (h);
 
+    if (PREDICT_FALSE(memory + memory_size < v)) {
+       /*
+        * This will happen when the requested memory_size is too
+        * small to cope with the heap header and/or memory alignment.
+        */
+       clib_mem_vm_free(memory, memory_size);
+       return 0;
+    }
+
     size = memory + memory_size - v;
   }