summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-02-11 17:46:37 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-02-11 17:46:37 +0000
commit645b4021af446192e9eda96e3f53d42ef57de709 (patch)
treec52062da99ef8fb38d7b49fda25540d104e7b06b /lib/libc/stdlib
parent9c5075a0048df850c9e09020db0435b436547c2e (diff)
is we were set[ug]id an unitialized ptr bit us
Diffstat (limited to 'lib/libc/stdlib')
-rw-r--r--lib/libc/stdlib/malloc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index b7890a91c0b..da2c17b83d1 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.21 1997/02/09 22:55:38 tholo Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.22 1997/02/11 17:46:36 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -435,8 +435,11 @@ malloc_init ()
continue;
b[j] = '\0';
p = b;
- } else if (i == 1 && issetugid() == 0) {
- p = getenv("MALLOC_OPTIONS");
+ } else if (i == 1) {
+ if (issetugid() == 0)
+ p = getenv("MALLOC_OPTIONS");
+ else
+ continue;
} else if (i == 2) {
p = malloc_options;
}