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] Fix string/tester alignment code
Date: Fri, 5 Aug 2022 19:29:35 +0000 (GMT) [thread overview]
Message-ID: <20220805192935.5E7753857409@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=db674b0d98a687a4f5fe7e54ad8ace0e6a7cb5f7
commit db674b0d98a687a4f5fe7e54ad8ace0e6a7cb5f7
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Mon Mar 21 12:36:16 2022 +0000
Fix string/tester alignment code
The code assumed pointers can be converted to unsigned long without
loss of information.
Diff:
---
string/tester.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/string/tester.c b/string/tester.c
index 5a397055b1..8111cd12c3 100644
--- a/string/tester.c
+++ b/string/tester.c
@@ -27,6 +27,7 @@
#endif
#include <errno.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -529,7 +530,7 @@ test_strlen (void)
char *p;
for (i=0; i < 0x100; i++)
{
- p = (char *) ((unsigned long int)(buf + 0xff) & ~0xff) + i;
+ p = (char *) ((uintptr_t)(buf + 0xff) & ~0xff) + i;
strcpy (p, "OK");
strcpy (p+3, "BAD/WRONG");
check (strlen (p) == 2, 4+i);
@@ -554,7 +555,7 @@ test_strnlen (void)
char buf[4096];
for (int i = 0; i < 0x100; ++i)
{
- char *p = (char *) ((unsigned long int)(buf + 0xff) & ~0xff) + i;
+ char *p = (char *) ((uintptr_t)(buf + 0xff) & ~0xff) + i;
strcpy (p, "OK");
strcpy (p + 3, "BAD/WRONG");
check (strnlen (p, 100) == 2, 10 + i);
@@ -582,7 +583,7 @@ test_strchr (void)
char *p;
for (i=0; i < 0x100; i++)
{
- p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
+ p = (char *) ((uintptr_t) (buf + 0xff) & ~0xff) + i;
strcpy (p, "OK");
strcpy (p+3, "BAD/WRONG");
check (strchr (p, '/') == NULL, 9+i);
@@ -614,7 +615,7 @@ test_strchrnul (void)
char *p;
for (i=0; i < 0x100; i++)
{
- p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
+ p = (char *) ((uintptr_t) (buf + 0xff) & ~0xff) + i;
strcpy (p, "OK");
strcpy (p+3, "BAD/WRONG");
cp = strchrnul (p, '/');
@@ -643,7 +644,7 @@ test_rawmemchr (void)
char *p;
for (i=0; i < 0x100; i++)
{
- p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
+ p = (char *) ((uintptr_t) (buf + 0xff) & ~0xff) + i;
strcpy (p, "OK");
strcpy (p+3, "BAD/WRONG");
check (rawmemchr (p, 'R') == p+8, 6+i);
@@ -689,7 +690,7 @@ test_strrchr (void)
char *p;
for (i=0; i < 0x100; i++)
{
- p = (char *) ((unsigned long int) (buf + 0xff) & ~0xff) + i;
+ p = (char *) ((uintptr_t) (buf + 0xff) & ~0xff) + i;
strcpy (p, "OK");
strcpy (p+3, "BAD/WRONG");
check (strrchr (p, '/') == NULL, 9+i);
next reply other threads:[~2022-08-05 19:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-05 19:29 Szabolcs Nagy [this message]
2022-10-26 15:10 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=20220805192935.5E7753857409@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).