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] Revert "cheri: malloc: avoid switch over uintptr_t"
Date: Fri, 18 Nov 2022 11:35:47 +0000 (GMT)	[thread overview]
Message-ID: <20221118113547.A5F52384D984@sourceware.org> (raw)

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

commit 3caf385850a96d7536f4b988e225d6fc600d6185
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Wed Nov 16 14:27:41 2022 +0000

    Revert "cheri: malloc: avoid switch over uintptr_t"
    
    This reverts commit dc8f9560104f0803e53fa23bfd011aa9878d5a97.

Diff:
---
 malloc/mcheck-impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
index e908bfd062..00b766219b 100644
--- a/malloc/mcheck-impl.c
+++ b/malloc/mcheck-impl.c
@@ -74,7 +74,7 @@ checkhdr (const struct hdr *hdr)
        an error and report it.  */
     return MCHECK_OK;
 
-  switch (hdr->magic ^ ((unsigned long) hdr->prev + (unsigned long) hdr->next))
+  switch (hdr->magic ^ ((uintptr_t) hdr->prev + (uintptr_t) hdr->next))
     {
     default:
       status = MCHECK_HEAD;

                 reply	other threads:[~2022-11-18 11:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20221118113547.A5F52384D984@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).