summaryrefslogtreecommitdiff
path: root/lib/libbsdmalloc/malloc.c
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2023-07-05 12:08:49 +0000
committerriastradh <riastradh@NetBSD.org>2023-07-05 12:08:49 +0000
commit6f360aba0d5f7055909496e40143a77d1ae6acf4 (patch)
tree119924359b2d03cb5225ce03329fb42c717a6891 /lib/libbsdmalloc/malloc.c
parent2a5671348a101277d9369192585fb90e2fc62912 (diff)
libbsdmalloc: Make aligned_alloc(A, S) actually align when A > S.
XXX pullup-10
Diffstat (limited to 'lib/libbsdmalloc/malloc.c')
-rw-r--r--lib/libbsdmalloc/malloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libbsdmalloc/malloc.c b/lib/libbsdmalloc/malloc.c
index a0fbd30946d..7c01adc8629 100644
--- a/lib/libbsdmalloc/malloc.c
+++ b/lib/libbsdmalloc/malloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.c,v 1.7 2023/07/05 10:57:44 riastradh Exp $ */
+/* $NetBSD: malloc.c,v 1.8 2023/07/05 12:08:49 riastradh Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)malloc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: malloc.c,v 1.7 2023/07/05 10:57:44 riastradh Exp $");
+__RCSID("$NetBSD: malloc.c,v 1.8 2023/07/05 12:08:49 riastradh Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -534,7 +534,7 @@ aligned_alloc(size_t alignment, size_t size)
errno = EINVAL;
return NULL;
}
- p = malloc(size);
+ p = malloc(size < alignment ? alignment : size);
if (__predict_false(p == NULL))
ASSERT((uintptr_t)p % alignment == 0);
return p;