Browse Source

no longer a need for the free(malloc(1)) hack, because the brk stuff

no longer needs initializing (we use mmap for malloc entirely now)
noticed by kjell, ok dhartmei, tested by me
OPENBSD_3_8
deraadt 19 years ago
parent
commit
2f71051cb2
1 changed files with 5 additions and 9 deletions
  1. +5
    -9
      src/lib/libc/stdlib/atexit.c

+ 5
- 9
src/lib/libc/stdlib/atexit.c View File

@ -29,7 +29,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: atexit.c,v 1.8 2005/03/30 18:51:49 pat Exp $";
static char *rcsid = "$OpenBSD: atexit.c,v 1.9 2005/06/17 21:38:59 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <sys/types.h> #include <sys/types.h>
@ -73,10 +73,6 @@ atexit(void (*fn)(void))
return (-1); return (-1);
} }
if (p == NULL) { if (p == NULL) {
if (__atexit_invalid) {
free(malloc(1));
__atexit_invalid = 0;
}
p = mmap(NULL, pgsize, PROT_READ | PROT_WRITE, p = mmap(NULL, pgsize, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0); MAP_ANON | MAP_PRIVATE, -1, 0);
if (p == MAP_FAILED) if (p == MAP_FAILED)
@ -90,6 +86,8 @@ atexit(void (*fn)(void))
sizeof(p->fns[0]); sizeof(p->fns[0]);
p->next = __atexit; p->next = __atexit;
__atexit = p; __atexit = p;
if (__atexit_invalid)
__atexit_invalid = 0;
} }
p->fns[p->ind++] = fn; p->fns[p->ind++] = fn;
if (mprotect(p, pgsize, PROT_READ)) if (mprotect(p, pgsize, PROT_READ))
@ -111,10 +109,6 @@ __atexit_register_cleanup(void (*fn)(void))
while (p != NULL && p->next != NULL) while (p != NULL && p->next != NULL)
p = p->next; p = p->next;
if (p == NULL) { if (p == NULL) {
if (__atexit_invalid) {
free(malloc(1));
__atexit_invalid = 0;
}
p = mmap(NULL, pgsize, PROT_READ | PROT_WRITE, p = mmap(NULL, pgsize, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0); MAP_ANON | MAP_PRIVATE, -1, 0);
if (p == MAP_FAILED) if (p == MAP_FAILED)
@ -124,6 +118,8 @@ __atexit_register_cleanup(void (*fn)(void))
sizeof(p->fns[0]); sizeof(p->fns[0]);
p->next = NULL; p->next = NULL;
__atexit = p; __atexit = p;
if (__atexit_invalid)
__atexit_invalid = 0;
} else { } else {
if (mprotect(p, pgsize, PROT_READ | PROT_WRITE)) if (mprotect(p, pgsize, PROT_READ | PROT_WRITE))
return; return;


Loading…
Cancel
Save