diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-04-10 09:24:44 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-04-10 09:24:44 +0000 |
| commit | aad4b9d1e82a32a2816eef0332b7ccba67370b91 (patch) | |
| tree | d5ccdc0203aeee358d625bc0a53fbe3a40e48064 /lib/libc/stdlib/malloc.c | |
| parent | 4bfe86c04275d079c0da0c1336974ecd09cb65aa (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) |
