summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1996-09-11 03:04:43 +0000
committerderaadt <deraadt@openbsd.org>1996-09-11 03:04:43 +0000
commite00c0bc864ef6a6ee49bd4f6e9d4d35314bb2985 (patch)
tree89015930f53ab50a1ac1a769d56764ed3ca30862 /lib/libc/stdlib/malloc.c
parentFix deref of free()'d ptr. NetBSD PR#2747 from beal@dilbert.umiacs.umd.edu (diff)
downloadwireguard-openbsd-e00c0bc864ef6a6ee49bd4f6e9d4d35314bb2985.tar.xz
wireguard-openbsd-e00c0bc864ef6a6ee49bd4f6e9d4d35314bb2985.zip
only support MALLOC_OPTIONS for non-setuid
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index e82a5953fdb..bdae6f00a32 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.9 1996/09/06 16:14:36 tholo Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.10 1996/09/11 03:04:43 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -526,8 +526,9 @@ malloc_init ()
malloc_junk = 1;
#endif /* EXTRA_SANITY */
- for (p=getenv("MALLOC_OPTIONS"); p && *p; p++) {
- switch (*p) {
+ if (issetugid() == 0) {
+ for (p=getenv("MALLOC_OPTIONS"); p && *p; p++) {
+ switch (*p) {
case 'a': malloc_abort = 0; break;
case 'A': malloc_abort = 1; break;
#ifdef MALLOC_STATS
@@ -544,6 +545,7 @@ malloc_init ()
wrtwarning("(Init): Unknown char in MALLOC_OPTIONS\n");
p = 0;
break;
+ }
}
}