diff options
| author | thorpej <thorpej@NetBSD.org> | 1999-07-08 22:18:06 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 1999-07-08 22:18:06 +0000 |
| commit | 602452569daa46be5fbc3bae38e612ac60e48c9a (patch) | |
| tree | 6eba669b3c4acbf62980ed501197d44099d307c1 /lib/libc/stdlib/malloc.c | |
| parent | 34a0f206335f411d0cb154c39329100b7d2b226d (diff) | |
Make sure errno is set to ENOMEM if we return NULL.
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index fd3d107fc2e..1776cd80576 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: malloc.c,v 1.23 1999/07/05 22:14:38 thorpej Exp $ */ +/* $NetBSD: malloc.c,v 1.24 1999/07/08 22:18:06 thorpej Exp $ */ /* * ---------------------------------------------------------------------------- @@ -1082,8 +1082,11 @@ malloc(size_t size) UTRACE(0, size, r); malloc_active--; THREAD_UNLOCK(); - if (malloc_xmalloc && !r) - wrterror("out of memory.\n"); + if (r == NULL) { + if (malloc_xmalloc) + wrterror("out of memory.\n"); + errno = ENOMEM; + } return (r); } @@ -1134,7 +1137,10 @@ realloc(void *ptr, size_t size) UTRACE(ptr, size, r); malloc_active--; THREAD_UNLOCK(); - if (malloc_xmalloc && !r) - wrterror("out of memory.\n"); + if (r == NULL) { + if (malloc_xmalloc) + wrterror("out of memory.\n"); + errno = ENOMEM; + } return (r); } |
