summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2001-11-17 10:57:04 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2001-11-17 10:57:04 +0000
commit7224d02a0d9bdae91b0bb845c7ac121f51e09979 (patch)
tree44a9d7e4e59e43446a2f45dc5cbd71a4942cdbfa /lib/libc/stdlib/malloc.c
parentb1e4abd2464bb5552ab1c65f9574adb61d9a36fd (diff)
Notes
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 999c9b5627d4..5bfa4ee2eac9 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1128,7 +1128,8 @@ free(void *ptr)
void *
realloc(void *ptr, size_t size)
{
- register void *r;
+ void *r;
+ int err = 0;
THREAD_LOCK();
malloc_func = " in realloc():";
@@ -1154,13 +1155,15 @@ realloc(void *ptr, size_t size)
r = ZEROSIZEPTR;
} else if (!ptr) {
r = imalloc(size);
+ err = (r == NULL);
} else {
r = irealloc(ptr, size);
+ err = (r == NULL);
}
UTRACE(ptr, size, r);
malloc_active--;
THREAD_UNLOCK();
- if (malloc_xmalloc && !r)
+ if (malloc_xmalloc && err)
wrterror("out of memory\n");
return (r);
}