From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id DBE3C385220F; Wed, 23 Nov 2022 14:39:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DBE3C385220F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214350; bh=Ln86NIBcGumPRMUIVSyjtxWba23dGyCF9kW1Etm0Vqo=; h=From:To:Subject:Date:From; b=UFNzC85gVtyY0ILePtFp3Hxe2VJPbPRrPfk7bDMJyHFaFyt1ISpYMApagvKfE9NbU c9Jd/37rwhMflAYsZoAjSVTMW9qEKmVmRVlGVRHANzPnE4p/vEcTckMWYMb5Te9SeL Top8Eia/asVUjHKhSvm2zXr3zxT89zR5gtnaAxcA= 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/arm/morello/main] malloc: Use uintptr_t for pointer alignment X-Act-Checkin: glibc X-Git-Author: Carlos Eduardo Seo X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 13de83e5cfee8c5f79e04e10e22b88959481e50b X-Git-Newrev: 17034ac2bf79f415150b5b32b0e2bf24b8636267 Message-Id: <20221123143910.DBE3C385220F@sourceware.org> Date: Wed, 23 Nov 2022 14:39:10 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=17034ac2bf79f415150b5b32b0e2bf24b8636267 commit 17034ac2bf79f415150b5b32b0e2bf24b8636267 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. Diff: --- malloc/arena.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/malloc/arena.c b/malloc/arena.c index 0a684a720d..b1f5b4117f 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -444,7 +444,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 (;; ) { @@ -518,7 +518,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) @@ -760,7 +760,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;