summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorotto <>2017-04-06 08:39:47 +0000
committerotto <>2017-04-06 08:39:47 +0000
commit910e2170bfc06f5f7f3b05def270dcbffef0b155 (patch)
treedee796df067b848a06bae7f29200280887953d53 /src/lib
parent0403ae7d00b85a4ed9aac3dee7804185706a1c17 (diff)
downloadopenbsd-910e2170bfc06f5f7f3b05def270dcbffef0b155.tar.gz
openbsd-910e2170bfc06f5f7f3b05def270dcbffef0b155.tar.bz2
openbsd-910e2170bfc06f5f7f3b05def270dcbffef0b155.zip
first print size in meta-data then supplied arg size when an inconsistency is
detected wrt recallocarray()
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libc/stdlib/malloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 1e13c2de11..f2b8b1549b 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.218 2017/03/28 16:56:38 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.219 2017/04/06 08:39:47 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>
@@ -1738,8 +1738,8 @@ orecallocarray(struct dir_info *argpool, void *p, size_t oldsize,
1738 oldsize); 1738 oldsize);
1739 } 1739 }
1740 } else if (oldsize != sz - mopts.malloc_guard) 1740 } else if (oldsize != sz - mopts.malloc_guard)
1741 wrterror(pool, "recorded old size %zu != %zu", oldsize, 1741 wrterror(pool, "recorded old size %zu != %zu",
1742 sz - mopts.malloc_guard); 1742 sz - mopts.malloc_guard, oldsize);
1743 1743
1744 newptr = omalloc(pool, newsize, 0, f); 1744 newptr = omalloc(pool, newsize, 0, f);
1745 if (newptr == NULL) 1745 if (newptr == NULL)