diff options
author | 2003-10-15 21:37:01 +0000 | |
---|---|---|
committer | 2003-10-15 21:37:01 +0000 | |
commit | d8aa9cc686c926327a5c3cb095832ccba92713e0 (patch) | |
tree | 9116940d13219bdbafe95142db1780eada293b52 /lib/libc/stdlib/malloc.c | |
parent | asm readability register names are %r0 instead of 0. No binary change. (diff) | |
download | wireguard-openbsd-d8aa9cc686c926327a5c3cb095832ccba92713e0.tar.xz wireguard-openbsd-d8aa9cc686c926327a5c3cb095832ccba92713e0.zip |
abort on errors by default. workaround so running out of memory isn't
actually an error, A still applies full effect.
suggested by phk. ok deraadt@ tdeval@
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r-- | lib/libc/stdlib/malloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index b6762298a19..15feb6d2d38 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -8,7 +8,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: malloc.c,v 1.62 2003/10/02 00:02:10 tedu Exp $"; +static char rcsid[] = "$OpenBSD: malloc.c,v 1.63 2003/10/15 21:37:01 tedu Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -177,7 +177,7 @@ static size_t malloc_ninfo; static struct pgfree free_list; /* Abort(), user doesn't handle problems. */ -static int malloc_abort; +static int malloc_abort = 2; /* Are we trying to die ? */ static int suicide; @@ -839,7 +839,7 @@ imalloc(size_t size) else result = malloc_pages(size); - if (malloc_abort && result == NULL) + if (malloc_abort == 1 && result == NULL) wrterror("allocation failed\n"); if (malloc_zero && result != NULL) |