summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2018-01-30 17:46:41 +0000
committerotto <otto@openbsd.org>2018-01-30 17:46:41 +0000
commit18ee316ae3e58d37019b7c833aa4021f1bd1d1c2 (patch)
tree0e24010912de4c67984e3adfa75002951a148565 /lib/libc/stdlib/malloc.c
parentkill a gcc warning (diff)
downloadwireguard-openbsd-18ee316ae3e58d37019b7c833aa4021f1bd1d1c2.tar.xz
wireguard-openbsd-18ee316ae3e58d37019b7c833aa4021f1bd1d1c2.zip
keep in sync with ld.so malloc.c
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 663d0877ae6..ebe032a7839 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc.c,v 1.243 2018/01/28 13:41:48 otto Exp $ */
+/* $OpenBSD: malloc.c,v 1.244 2018/01/30 17:46:41 otto Exp $ */
/*
* Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
* Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -882,7 +882,8 @@ omalloc_make_chunks(struct dir_info *d, int bits, int listnum)
goto err;
bp->page = pp;
- if (insert(d, (void *)((uintptr_t)pp | bits + 1), (uintptr_t)bp, NULL))
+ if (insert(d, (void *)((uintptr_t)pp | (bits + 1)), (uintptr_t)bp,
+ NULL))
goto err;
LIST_INSERT_HEAD(&d->chunk_dir[bits][listnum], bp, entries);
return bp;