public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/arm/morello/main] cheri: Fix pointer alignment in fts
Date: Wed, 26 Oct 2022 15:11:18 +0000 (GMT)	[thread overview]
Message-ID: <20221026151118.48B78385152D@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fe148f704fbc0664be391c264a6715456e1d0fa1

commit fe148f704fbc0664be391c264a6715456e1d0fa1
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Tue Jul 12 10:59:16 2022 +0100

    cheri: Fix pointer alignment in fts
    
    ALIGN has to work on pointers and the code assumed unsigned long can
    always represent pointers.

Diff:
---
 io/fts.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/io/fts.c b/io/fts.c
index 283cf1791a..5a0a47a360 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -55,6 +55,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #include <dirent.h>
 #include <errno.h>
 #include <fts.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -67,7 +68,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #endif
 /* Align P to that size.  */
 #ifndef ALIGN
-#define	ALIGN(p)	(((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
+#define	ALIGN(p)	(((uintptr_t) (p) + ALIGNBYTES) & ~ALIGNBYTES)
 #endif

             reply	other threads:[~2022-10-26 15:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-26 15:11 Szabolcs Nagy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-08-05 19:29 Szabolcs Nagy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221026151118.48B78385152D@sourceware.org \
    --to=nsz@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).