CVS commit: src/lib/libbsdmalloc

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Wed Jul  5 12:08:49 UTC 2023

Modified Files:
        src/lib/libbsdmalloc: malloc.c

Log Message:
libbsdmalloc: Make aligned_alloc(A, S) actually align when A > S.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libbsdmalloc/malloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libbsdmalloc/malloc.c
diff -u src/lib/libbsdmalloc/malloc.c:1.7 src/lib/libbsdmalloc/malloc.c:1.8
--- src/lib/libbsdmalloc/malloc.c:1.7	Wed Jul  5 10:57:44 2023
+++ src/lib/libbsdmalloc/malloc.c	Wed Jul  5 12:08:49 2023
@@ -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 s
 		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;