public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] cheri: Fix pointer alignment in fts
@ 2022-08-05 19:29 Szabolcs Nagy
0 siblings, 0 replies; 2+ messages in thread
From: Szabolcs Nagy @ 2022-08-05 19:29 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=30719666f854d4c0c6b8b2430dd1dff78851d59f
commit 30719666f854d4c0c6b8b2430dd1dff78851d59f
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [glibc/arm/morello/main] cheri: Fix pointer alignment in fts
@ 2022-10-26 15:11 Szabolcs Nagy
0 siblings, 0 replies; 2+ messages in thread
From: Szabolcs Nagy @ 2022-10-26 15:11 UTC (permalink / raw)
To: glibc-cvs
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-26 15:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 19:29 [glibc/arm/morello/main] cheri: Fix pointer alignment in fts Szabolcs Nagy
2022-10-26 15:11 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).