diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libc/stdlib/malloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 711c8470ef..1cbe7fa084 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: malloc.c,v 1.96 2008/08/23 06:15:16 djm Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.97 2008/08/23 07:49:38 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> |
4 | * | 4 | * |
@@ -1078,14 +1078,14 @@ omalloc(size_t sz, int zero_fill) | |||
1078 | errno = ENOMEM; | 1078 | errno = ENOMEM; |
1079 | return NULL; | 1079 | return NULL; |
1080 | } | 1080 | } |
1081 | if (malloc_junk) | ||
1082 | memset(p + sz, SOME_JUNK, psz - sz); | ||
1081 | if (malloc_guard) { | 1083 | if (malloc_guard) { |
1082 | if (mprotect((char *)p + psz - malloc_guard, | 1084 | if (mprotect((char *)p + psz - malloc_guard, |
1083 | malloc_guard, PROT_NONE)) | 1085 | malloc_guard, PROT_NONE)) |
1084 | wrterror("mprotect"); | 1086 | wrterror("mprotect"); |
1085 | malloc_guarded += malloc_guard; | 1087 | malloc_guarded += malloc_guard; |
1086 | } | 1088 | } |
1087 | if (malloc_junk) | ||
1088 | memset(p + sz, SOME_JUNK, psz - sz - malloc_guard); | ||
1089 | 1089 | ||
1090 | /* shift towards the end */ | 1090 | /* shift towards the end */ |
1091 | if (malloc_move && | 1091 | if (malloc_move && |