diff options
Diffstat (limited to 'vppinfra/vppinfra/mheap.c')
| -rw-r--r-- | vppinfra/vppinfra/mheap.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vppinfra/vppinfra/mheap.c b/vppinfra/vppinfra/mheap.c index cd8672e7ef4..6163d0b1341 100644 --- 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; } |