summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorotto <>2018-01-30 17:46:41 +0000
committerotto <>2018-01-30 17:46:41 +0000
commit76d15e276d8fa3d19f496577da2b8da32a643d27 (patch)
tree95aa0cf20c46e101fbafb1eda3edbdf21c3a81c7
parent847cc56b5d34975d137c9ac5be697d5a97d442e4 (diff)
downloadopenbsd-76d15e276d8fa3d19f496577da2b8da32a643d27.tar.gz
openbsd-76d15e276d8fa3d19f496577da2b8da32a643d27.tar.bz2
openbsd-76d15e276d8fa3d19f496577da2b8da32a643d27.zip
keep in sync with ld.so malloc.c
-rw-r--r--src/lib/libc/stdlib/malloc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 663d0877ae..ebe032a783 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.243 2018/01/28 13:41:48 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.244 2018/01/30 17:46:41 otto Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -882,7 +882,8 @@ omalloc_make_chunks(struct dir_info *d, int bits, int listnum)
882 goto err; 882 goto err;
883 bp->page = pp; 883 bp->page = pp;
884 884
885 if (insert(d, (void *)((uintptr_t)pp | bits + 1), (uintptr_t)bp, NULL)) 885 if (insert(d, (void *)((uintptr_t)pp | (bits + 1)), (uintptr_t)bp,
886 NULL))
886 goto err; 887 goto err;
887 LIST_INSERT_HEAD(&d->chunk_dir[bits][listnum], bp, entries); 888 LIST_INSERT_HEAD(&d->chunk_dir[bits][listnum], bp, entries);
888 return bp; 889 return bp;