diff options
| author | niklas <> | 1997-02-11 17:46:36 +0000 |
|---|---|---|
| committer | niklas <> | 1997-02-11 17:46:36 +0000 |
| commit | 26e3e21ecd7e0d1e5e157c0ba6b2bd45e95e34f9 (patch) | |
| tree | c37e98e26cdaf2d01ef3b6b9e1ef8d878a965dc2 /src/lib/libc/stdlib/malloc.c | |
| parent | 2819515b408d1cf65d81fe1056591238bdbb5824 (diff) | |
| download | openbsd-26e3e21ecd7e0d1e5e157c0ba6b2bd45e95e34f9.tar.gz openbsd-26e3e21ecd7e0d1e5e157c0ba6b2bd45e95e34f9.tar.bz2 openbsd-26e3e21ecd7e0d1e5e157c0ba6b2bd45e95e34f9.zip | |
is we were set[ug]id an unitialized ptr bit us
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index b7890a91c0..da2c17b83d 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #if defined(LIBC_SCCS) && !defined(lint) | 10 | #if defined(LIBC_SCCS) && !defined(lint) |
| 11 | static char rcsid[] = "$OpenBSD: malloc.c,v 1.21 1997/02/09 22:55:38 tholo Exp $"; | 11 | static char rcsid[] = "$OpenBSD: malloc.c,v 1.22 1997/02/11 17:46:36 niklas Exp $"; |
| 12 | #endif /* LIBC_SCCS and not lint */ | 12 | #endif /* LIBC_SCCS and not lint */ |
| 13 | 13 | ||
| 14 | /* | 14 | /* |
| @@ -435,8 +435,11 @@ malloc_init () | |||
| 435 | continue; | 435 | continue; |
| 436 | b[j] = '\0'; | 436 | b[j] = '\0'; |
| 437 | p = b; | 437 | p = b; |
| 438 | } else if (i == 1 && issetugid() == 0) { | 438 | } else if (i == 1) { |
| 439 | p = getenv("MALLOC_OPTIONS"); | 439 | if (issetugid() == 0) |
| 440 | p = getenv("MALLOC_OPTIONS"); | ||
| 441 | else | ||
| 442 | continue; | ||
| 440 | } else if (i == 2) { | 443 | } else if (i == 2) { |
| 441 | p = malloc_options; | 444 | p = malloc_options; |
| 442 | } | 445 | } |
