Browse Source

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@
OPENBSD_3_5
tedu 21 years ago
parent
commit
a63df3864b
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/lib/libc/stdlib/malloc.c

+ 3
- 3
src/lib/libc/stdlib/malloc.c View File

@ -8,7 +8,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #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 */ #endif /* LIBC_SCCS and not lint */
/* /*
@ -177,7 +177,7 @@ static size_t malloc_ninfo;
static struct pgfree free_list; static struct pgfree free_list;
/* Abort(), user doesn't handle problems. */ /* Abort(), user doesn't handle problems. */
static int malloc_abort;
static int malloc_abort = 2;
/* Are we trying to die ? */ /* Are we trying to die ? */
static int suicide; static int suicide;
@ -839,7 +839,7 @@ imalloc(size_t size)
else else
result = malloc_pages(size); result = malloc_pages(size);
if (malloc_abort && result == NULL)
if (malloc_abort == 1 && result == NULL)
wrterror("allocation failed\n"); wrterror("allocation failed\n");
if (malloc_zero && result != NULL) if (malloc_zero && result != NULL)


Loading…
Cancel
Save