diff options
| author |   otto <otto@openbsd.org> | 2017-07-10 09:44:16 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2017-07-10 09:44:16 +0000 |
| commit | c4a372326fd7300305140689a8979953d10fd68d (patch) | |
| tree | c4d76ee657c748cebf258fc0743aea37117c46b6 /lib/libc/stdlib/malloc.c | |
| parent | re-add unintentionally removed cleandir part that rm tags from the .CURDIR (diff) | |
| download | wireguard-openbsd-c4a372326fd7300305140689a8979953d10fd68d.tar.xz wireguard-openbsd-c4a372326fd7300305140689a8979953d10fd68d.zip | |
one more instance of the previous commit; also initialize ->offset to a
definite value in the size == 0 case
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index dc2c7b1500f..22f83f35252 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.227 2017/07/07 19:14:46 otto Exp $ */ +/* $OpenBSD: malloc.c,v 1.228 2017/07/10 09:44:16 otto Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -886,6 +886,7 @@ omalloc_make_chunks(struct dir_info *d, int bits, int listnum) while (i >>= 1) bp->shift++; bp->total = bp->free = MALLOC_PAGESIZE >> bp->shift; + bp->offset = 0xdead; bp->page = pp; k = mprotect(pp, MALLOC_PAGESIZE, PROT_NONE); @@ -1793,7 +1794,7 @@ orecallocarray(struct dir_info *argpool, void *p, size_t oldsize, REALSIZE(sz, r); if (sz <= MALLOC_MAXCHUNK) { - if (mopts.chunk_canaries) { + if (mopts.chunk_canaries && sz > 0) { struct chunk_info *info = (struct chunk_info *)r->size; uint32_t chunknum = find_chunknum(pool, r, p, 0); |