From: René Scharfe <l.s.r@web.de>
Date: Mon, 15 Nov 2021 23:19:38 +0000 (+0100)
Subject: mergesort: avoid left shift overflow
X-Git-Tag: v2.35.0-rc0~108^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42c456ff8116fb0373c5cf6df54d34cb343b058e;p=thirdparty%2Fgit.git

mergesort: avoid left shift overflow

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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++;