diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2019-05-23 06:43:19 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2019-05-23 06:43:19 +0000 |
| commit | 3aac2db9512151612265ea7e0e0e78795cf41115 (patch) | |
| tree | 7061d0751d409928b405f156ebbfbc8adfafa6da | |
| parent | ec3cb8106a9596fce78f22d8d9ce1c734b379c79 (diff) | |
Only override size of chunk if we're not given the actual length.
Fixes malloc_conceal...freezero with malloc options C and/or G.
| -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 ff41f613857..f2e82679e9d 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.260 2019/05/10 15:03:24 otto Exp $ */ +/* $OpenBSD: malloc.c,v 1.261 2019/05/23 06:43:18 otto Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -1371,7 +1371,8 @@ ofree(struct dir_info **argpool, void *p, int clear, int check, size_t argsz) REALSIZE(sz, r); if (pool->mmap_flag) { clear = 1; - argsz = sz; + if (!check) + argsz = sz; } if (check) { if (sz <= MALLOC_MAXCHUNK) { |