From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id ADB013858C55; Tue, 1 Nov 2022 09:48:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ADB013858C55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667296130; bh=edXYeqiYq7o7z27LrwBhAqGyUPvLgLnkT9N+sw45NXs=; h=From:To:Subject:Date:From; b=jRYbT4IELq/zHWD5RAPUALYz7DMgAZYb1b7UHRXUytfk/KbByzq+GYkJRkKQ83E1R tDoOA4F0apf4UpaTCSmYVmoFky4Rf+JxVHGltZ3xJ9pUYR3vG9C0tW7WhKPwPPlhTr IHmTf6NjTd9xrroWym6+HDxNW1IcwKn5wXAy6kwk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc] malloc: Use uintptr_t for pointer alignment X-Act-Checkin: glibc X-Git-Author: Carlos Eduardo Seo X-Git-Refname: refs/heads/master X-Git-Oldrev: f4973d31bb0673bc6a5fc207713837f143920b01 X-Git-Newrev: d08dec4ea7c9f8b1d734cc1ba80c7f70df2f2c25 Message-Id: <20221101094850.ADB013858C55@sourceware.org> Date: Tue, 1 Nov 2022 09:48:50 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d08dec4ea7c9f8b1d734cc1ba80c7f70df2f2c25 commit d08dec4ea7c9f8b1d734cc1ba80c7f70df2f2c25 Author: Carlos Eduardo Seo 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 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;