Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

make malloc, calloc and some other function return NULL if size is 0

Browse source 
svn path=/trunk/; revision=22195
This commit is contained in:
Magnus Olsen 2006-06-03 13:22:11 +00:00
parent 19a69b58d8
commit 3b3b7ad5fd
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/lib/crt/stdlib/malloc.c
View file

@ -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));
}