diff options
| author | djm <> | 2008-08-23 06:15:16 +0000 |
|---|---|---|
| committer | djm <> | 2008-08-23 06:15:16 +0000 |
| commit | cd1decab63b4178d5d7867849ca78a35ec2c9824 (patch) | |
| tree | f1352796c9c72363a5799ab29a7340f287868496 | |
| parent | d6b49357a23bf3b25d553524944d17a6d109a9c6 (diff) | |
| download | openbsd-cd1decab63b4178d5d7867849ca78a35ec2c9824.tar.gz openbsd-cd1decab63b4178d5d7867849ca78a35ec2c9824.tar.bz2 openbsd-cd1decab63b4178d5d7867849ca78a35ec2c9824.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@
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 4379e09157..711c8470ef 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.95 2008/08/22 21:25:10 otto Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.96 2008/08/23 06:15:16 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> |
| 4 | * | 4 | * |
| @@ -1085,7 +1085,7 @@ omalloc(size_t sz, int zero_fill) | |||
| 1085 | malloc_guarded += malloc_guard; | 1085 | malloc_guarded += malloc_guard; |
| 1086 | } | 1086 | } |
| 1087 | if (malloc_junk) | 1087 | if (malloc_junk) |
| 1088 | memset(p, SOME_JUNK, psz - malloc_guard); | 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 && |