Module Name: src
Committed By: riastradh
Date: Mon Jan 20 20:00:52 UTC 2025
Modified Files:
src/lib/libbsdmalloc: malloc.c
Log Message:
libbsdmalloc: Fix sense of assertion in aligned_alloc.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/lib/libbsdmalloc/malloc.c:1.11
--- src/lib/libbsdmalloc/malloc.c:1.10 Sat Jul 8 04:09:26 2023
+++ src/lib/libbsdmalloc/malloc.c Mon Jan 20 20:00:52 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.c,v 1.10 2023/07/08 04:09:26 simonb Exp $ */
+/* $NetBSD: malloc.c,v 1.11 2025/01/20 20:00:52 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.10 2023/07/08 04:09:26 simonb Exp $");
+__RCSID("$NetBSD: malloc.c,v 1.11 2025/01/20 20:00:52 riastradh Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -535,7 +535,7 @@ aligned_alloc(size_t alignment, size_t s
return NULL;
}
p = malloc(size < alignment ? alignment : size);
- if (__predict_false(p == NULL))
+ if (__predict_true(p != NULL))
ASSERT((uintptr_t)p % alignment == 0);
return p;
}
