diff options
Diffstat (limited to 'libc')
-rw-r--r-- | libc/stdlib/malloc-simple/alloc.c | 6 | ||||
-rw-r--r-- | libc/stdlib/malloc-standard/malloc.c | 7 | ||||
-rw-r--r-- | libc/stdlib/malloc/malloc.c | 6 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c index a3c068a5b..3baf75fdd 100644 --- a/libc/stdlib/malloc-simple/alloc.c +++ b/libc/stdlib/malloc-simple/alloc.c @@ -25,13 +25,7 @@ void *malloc(size_t size) void *result; if (unlikely(size == 0)) { -#if defined(__MALLOC_GLIBC_COMPAT__) size++; -#else - /* Some programs will call malloc (0). Lets be strict and return NULL */ - __set_errno(ENOMEM); - return NULL; -#endif } #ifdef __ARCH_USE_MMU__ diff --git a/libc/stdlib/malloc-standard/malloc.c b/libc/stdlib/malloc-standard/malloc.c index fd33b50c7..309f52859 100644 --- a/libc/stdlib/malloc-standard/malloc.c +++ b/libc/stdlib/malloc-standard/malloc.c @@ -825,13 +825,6 @@ void* malloc(size_t bytes) void * sysmem; void * retval; -#if !defined(__MALLOC_GLIBC_COMPAT__) - if (!bytes) { - __set_errno(ENOMEM); - return NULL; - } -#endif - /* Convert request size to internal form by adding (sizeof(size_t)) bytes overhead plus possibly more to obtain necessary alignment and/or diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c index f6bf10a93..8d8ac7ffc 100644 --- a/libc/stdlib/malloc/malloc.c +++ b/libc/stdlib/malloc/malloc.c @@ -208,14 +208,8 @@ malloc (size_t size) __heap_check (__malloc_heap, "malloc"); #endif -#ifdef __MALLOC_GLIBC_COMPAT__ if (unlikely (size == 0)) size++; -#else - /* Some programs will call malloc (0). Lets be strict and return NULL */ - if (unlikely (size == 0)) - goto oom; -#endif /* Check if they are doing something dumb like malloc(-1) */ if (unlikely(((unsigned long)size > (unsigned long)(MALLOC_HEADER_SIZE*-2)))) |