diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2000-08-23 00:12:17 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2000-08-23 00:12:17 +0000 |
| commit | 91d04eff70b4bd851dff6ae1812c1ac6eb5700c9 (patch) | |
| tree | 1d25e54690a3176808b5effb0a60cd715426507e /lib/libc/stdlib/malloc.c | |
| parent | 1e784a779213fe04c82bc5397f8d1d32ccced8f1 (diff) | |
Notes
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index ac0dd485093c..412171840dfd 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -715,9 +715,6 @@ imalloc(size_t size) else result = malloc_pages(size); - if (malloc_abort && !result) - wrterror("allocation failed.\n"); - if (malloc_zero && result) memset(result, 0, size); @@ -1067,6 +1064,7 @@ malloc(size_t size) if (malloc_active++) { wrtwarning("recursive call.\n"); malloc_active--; + THREAD_UNLOCK(); return (0); } if (!malloc_started) |
