The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d60130bf32a3c35417f276507dcdfa569397dae3
commit d60130bf32a3c35417f276507dcdfa569397dae3 Author: Konstantin Belousov <[email protected]> AuthorDate: 2023-07-25 12:54:45 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2023-08-21 14:16:42 +0000 rtld_malloc: increase overhead index to uint16 Reorder it with magic, to keep alignment. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 1246238b3941..ac8af4d6b6e1 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -75,8 +75,8 @@ static caddr_t pagepool_start, pagepool_end; union overhead { union overhead *ov_next; /* when free */ struct { - u_char ovu_magic; /* magic number */ - u_char ovu_index; /* bucket # */ + uint16_t ovu_index; /* bucket # */ + uint8_t ovu_magic; /* magic number */ } ovu; #define ov_magic ovu.ovu_magic #define ov_index ovu.ovu_index
