hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-18 05:53:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

nvi: Replace Clang-only __builtin_is_aligned with C code (#124)

Browse Source 
We should use alignof in the future.

Obtained from: 25c4d7db4e
This commit is contained in:
Zhihao Yuan 2024-11-27 18:30:46 +00:00 committed by Brooks Davis
parent 56ef9c872b
commit 06a98fefd3
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/nvi/common/log.c
View File

@ -709,7 +709,7 @@ apply_with(int (*db_func)(SCR *, recno_t, CHAR_T *, size_t), SCR *sp,
static size_t blen;
static u_char *bp;
if (!__builtin_is_aligned(p, sizeof(unsigned long))) {
if (!is_aligned(p, sizeof(unsigned long))) {
if (len > blen) {
blen = p2roundup(MAX(len, 512));
REALLOC(sp, bp, u_char *, blen);

12
contrib/nvi/common/mem.h
View File

@ -212,6 +212,18 @@ p2roundup(size_t n)
return (n);
}
/*
* is_aligned --
* Determine whether the program can safely read an object with an
* alignment requirement from ptr.
*
* See also: https://clang.llvm.org/docs/LanguageExtensions.html#alignment-builtins
*/
static __inline int
is_aligned(void *ptr, size_t alignment) {
return ((uintptr_t)ptr % alignment) == 0;
}
/* Additional TAILQ helper. */
#define TAILQ_ENTRY_ISVALID(elm, field) \
((elm)->field.tqe_prev != NULL)