From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] mergesort: avoid left shift overflow
Date: Tue, 16 Nov 2021 00:19:38 +0100 [thread overview]
Message-ID: <5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de> (raw)
Use size_t to match n when building the bitmask for checking whether a
rank is occupied, instead of the default signed int.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
Ugh, sorry. :(
mergesort.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergesort.c b/mergesort.c
index 6216835566..bd9c6ef8ee 100644
--- a/mergesort.c
+++ b/mergesort.c
@@ -63,7 +63,7 @@ void *llist_mergesort(void *list,
void *next = get_next_fn(list);
if (next)
set_next_fn(list, NULL);
- for (i = 0; n & (1 << i); i++)
+ for (i = 0; n & ((size_t)1 << i); i++)
list = llist_merge(ranks[i], list, get_next_fn,
set_next_fn, compare_fn);
n++;
--
2.33.1
next reply other threads:[~2021-11-15 23:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 23:19 René Scharfe [this message]
2021-11-16 14:08 ` [PATCH] mergesort: avoid left shift overflow Johannes Schindelin
2021-11-17 9:19 ` Junio C Hamano
2021-11-17 23:31 ` Johannes Schindelin
2021-11-18 23:27 ` Philip Oakley
2021-11-19 16:51 ` Johannes Schindelin
2021-11-19 17:15 ` René Scharfe
2021-11-19 17:27 ` Philip Oakley
2021-11-19 19:28 ` Junio C Hamano
2021-11-19 21:16 ` Philip Oakley
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=5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 NNTP newsgroup(s).