From 3b3b7ad5fd7675576051b8a04483dcc2440d7a81 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sat, 3 Jun 2006 13:22:11 +0000 Subject: [PATCH] make malloc, calloc and some other function return NULL if size is 0 svn path=/trunk/; revision=22195 --- reactos/lib/crt/stdlib/malloc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/reactos/lib/crt/stdlib/malloc.c b/reactos/lib/crt/stdlib/malloc.c index 7ac5d484691..1ce9c4ae7cb 100644 --- a/reactos/lib/crt/stdlib/malloc.c +++ b/reactos/lib/crt/stdlib/malloc.c @@ -36,6 +36,9 @@ extern HANDLE hHeap; */ void* malloc(size_t _size) { + if ( _size == 0) + return NULL; + return HeapAlloc(hHeap, 0, ROUND_SIZE(_size)); } @@ -52,6 +55,9 @@ void free(void* _ptr) */ void* calloc(size_t _nmemb, size_t _size) { + if ( _size == 0) + return NULL; + return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_SIZE(_nmemb*_size) ); } @@ -60,6 +66,9 @@ void* calloc(size_t _nmemb, size_t _size) */ void* realloc(void* _ptr, size_t _size) { + if ( _size == 0) + return NULL; + if (!_ptr) return malloc(_size); if (_size) return HeapReAlloc(hHeap, 0, _ptr, ROUND_SIZE(_size)); free(_ptr); @@ -71,6 +80,9 @@ void* realloc(void* _ptr, size_t _size) */ void* _expand(void* _ptr, size_t _size) { + if ( _size == 0) + return NULL; + return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_SIZE(_size)); }