public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] malloc: Use uintptr_t for pointer alignment
@ 2022-11-01 9:48 Szabolcs Nagy
0 siblings, 0 replies; only message in thread
From: Szabolcs Nagy @ 2022-11-01 9:48 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d08dec4ea7c9f8b1d734cc1ba80c7f70df2f2c25
commit d08dec4ea7c9f8b1d734cc1ba80c7f70df2f2c25
Author: Carlos Eduardo Seo <carlos.seo@arm.com>
Date: Wed Jan 26 16:00:13 2022 -0300
malloc: Use uintptr_t for pointer alignment
Avoid integer casts that assume unsigned long can represent pointers.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diff:
---
malloc/arena.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/malloc/arena.c b/malloc/arena.c
index 074ecbc09f..f381f18371 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -439,7 +439,7 @@ dump_heap (heap_info *heap)
fprintf (stderr, "Heap %p, size %10lx:\n", heap, (long) heap->size);
ptr = (heap->ar_ptr != (mstate) (heap + 1)) ?
(char *) (heap + 1) : (char *) (heap + 1) + sizeof (struct malloc_state);
- p = (mchunkptr) (((unsigned long) ptr + MALLOC_ALIGN_MASK) &
+ p = (mchunkptr) (((uintptr_t) ptr + MALLOC_ALIGN_MASK) &
~MALLOC_ALIGN_MASK);
for (;; )
{
@@ -513,7 +513,7 @@ alloc_new_heap (size_t size, size_t top_pad, size_t pagesize,
p1 = (char *) MMAP (0, max_size << 1, PROT_NONE, mmap_flags);
if (p1 != MAP_FAILED)
{
- p2 = (char *) (((unsigned long) p1 + (max_size - 1))
+ p2 = (char *) (((uintptr_t) p1 + (max_size - 1))
& ~(max_size - 1));
ul = p2 - p1;
if (ul)
@@ -752,7 +752,7 @@ _int_new_arena (size_t size)
/* Set up the top chunk, with proper alignment. */
ptr = (char *) (a + 1);
- misalign = (unsigned long) chunk2mem (ptr) & MALLOC_ALIGN_MASK;
+ misalign = (uintptr_t) chunk2mem (ptr) & MALLOC_ALIGN_MASK;
if (misalign > 0)
ptr += MALLOC_ALIGNMENT - misalign;
top (a) = (mchunkptr) ptr;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-01 9:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-01 9:48 [glibc] malloc: Use uintptr_t for pointer alignment Szabolcs Nagy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).