diff options
| author |   djm <djm@openbsd.org> | 2008-08-23 06:15:16 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-08-23 06:15:16 +0000 |
| commit | 8c550973a391222e4c46caf456621288811d4971 (patch) | |
| tree | 1df7d44afb8519d258d42e3917c07964e13b8ecc /lib/libc/stdlib/malloc.c | |
| parent | unbreak wcschr(string, L'\0') which was incorrectly returning NULL (diff) | |
| download | wireguard-openbsd-8c550973a391222e4c46caf456621288811d4971.tar.xz wireguard-openbsd-8c550973a391222e4c46caf456621288811d4971.zip | |
fix calloc() for MALLOC_OPTIONS=J case: SOME_JUNK was being filled into
the freshly mmaped pages disrupting their pure zeroness;
ok otto@ deraadt@
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 4379e091574..711c8470efa 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.95 2008/08/22 21:25:10 otto Exp $ */ +/* $OpenBSD: malloc.c,v 1.96 2008/08/23 06:15:16 djm Exp $ */ /* * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> * @@ -1085,7 +1085,7 @@ omalloc(size_t sz, int zero_fill) malloc_guarded += malloc_guard; } if (malloc_junk) - memset(p, SOME_JUNK, psz - malloc_guard); + memset(p + sz, SOME_JUNK, psz - sz - malloc_guard); /* shift towards the end */ if (malloc_move && |