From 6f360aba0d5f7055909496e40143a77d1ae6acf4 Mon Sep 17 00:00:00 2001 From: riastradh Date: Wed, 5 Jul 2023 12:08:49 +0000 Subject: libbsdmalloc: Make aligned_alloc(A, S) actually align when A > S. XXX pullup-10 --- lib/libbsdmalloc/malloc.c | 6 +++--- 1 file 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; -- cgit