summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorespie <>2014-04-23 10:47:15 +0000
committerespie <>2014-04-23 10:47:15 +0000
commitb4ee483c86083036a32c5fbb5b0a41b625b9f990 (patch)
treea020765a75a1d022c0f53e82509e8c07f4def212 /src
parent287973ef83e358f7b35485490c84a84f899acc00 (diff)
downloadopenbsd-b4ee483c86083036a32c5fbb5b0a41b625b9f990.tar.gz
openbsd-b4ee483c86083036a32c5fbb5b0a41b625b9f990.tar.bz2
openbsd-b4ee483c86083036a32c5fbb5b0a41b625b9f990.zip
explain a bit more what's going on for stupid me.
okay otto@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libc/stdlib/malloc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 5db51d58ee..6c38d6ad87 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.156 2014/04/23 05:43:25 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.157 2014/04/23 10:47:15 espie Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -1388,6 +1388,9 @@ realloc(void *ptr, size_t size)
1388} 1388}
1389 1389
1390 1390
1391/* this is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
1392 * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
1393 */
1391#define MUL_NO_OVERFLOW (1UL << (sizeof(size_t) * 4)) 1394#define MUL_NO_OVERFLOW (1UL << (sizeof(size_t) * 4))
1392 1395
1393void * 1396void *