diff options
| author | Michael Brown | 2014-12-15 15:42:26 +0100 |
|---|---|---|
| committer | Michael Brown | 2014-12-15 15:42:26 +0100 |
| commit | 9154f2aef36cc803fcb2054805823185d53411bd (patch) | |
| tree | 91d6fd2ec19fcb306791c0e835b761934a1f4e4e /src/core/malloc.c | |
| parent | [malloc] Tidy up debug output (diff) | |
| download | ipxe-9154f2aef36cc803fcb2054805823185d53411bd.tar.gz ipxe-9154f2aef36cc803fcb2054805823185d53411bd.tar.xz ipxe-9154f2aef36cc803fcb2054805823185d53411bd.zip | |
[malloc] Sanity check parameters to alloc_memblock() and free_memblock()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/core/malloc.c')
| -rw-r--r-- | src/core/malloc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/malloc.c b/src/core/malloc.c index 42658128..0993bdac 100644 --- a/src/core/malloc.c +++ b/src/core/malloc.c @@ -237,6 +237,10 @@ void * alloc_memblock ( size_t size, size_t align, size_t offset ) { struct memory_block *post; struct memory_block *ptr; + /* Sanity checks */ + assert ( size != 0 ); + assert ( ( align == 0 ) || ( ( align & ( align - 1 ) ) == 0 ) ); + valgrind_make_blocks_defined(); /* Round up size to multiple of MIN_MEMBLOCK_SIZE and @@ -338,6 +342,7 @@ void free_memblock ( void *ptr, size_t size ) { /* Round up size to match actual size that alloc_memblock() * would have used. */ + assert ( size != 0 ); size = ( size + MIN_MEMBLOCK_SIZE - 1 ) & ~( MIN_MEMBLOCK_SIZE - 1 ); freeing = ptr; VALGRIND_MAKE_MEM_DEFINED ( freeing, sizeof ( *freeing ) ); @@ -444,6 +449,7 @@ void * realloc ( void *old_ptr, size_t new_size ) { data ); VALGRIND_MAKE_MEM_DEFINED ( old_block, offsetof ( struct autosized_block, data ) ); old_total_size = old_block->size; + assert ( old_total_size != 0 ); old_size = ( old_total_size - offsetof ( struct autosized_block, data ) ); memcpy ( new_ptr, old_ptr, |