From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id A5F52384D984; Fri, 18 Nov 2022 11:35:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5F52384D984 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668771347; bh=eP3L5eHxxnv9Amf4vJzIr7b9jEjr2e0ianC6MD7ogro=; h=From:To:Subject:Date:From; b=Lb7P3u4bGr7YsGyONF0V9bnTnXiYYWbf3Un4esSFyAaruBoU8KV+iMlESG6gy9ABt uyDjwQxRI5fBRhV8j1rs9V29eMbWudZsm8k7Pxj/D/i9/aHjX1ztozQ47ky1670H2P pppw5huwmziih/40GqcQLC8s9obPFarGQSImK0E0= 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] Revert "cheri: malloc: avoid switch over uintptr_t" X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 5b8ca6cbb1fa5a53cdb64a40541d4858295e34e3 X-Git-Newrev: 3caf385850a96d7536f4b988e225d6fc600d6185 Message-Id: <20221118113547.A5F52384D984@sourceware.org> Date: Fri, 18 Nov 2022 11:35:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3caf385850a96d7536f4b988e225d6fc600d6185 commit 3caf385850a96d7536f4b988e225d6fc600d6185 Author: Szabolcs Nagy 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;