diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:10 -0800 |
| commit | fc0e3e02c9c7919c03c1def260d83fc96b4f4b3e (patch) | |
| tree | afafc9c98b7364330cba93a8edb881a66ef4adb2 | |
| parent | 8e715503f1c57c43808ac63881e69cb51b08c145 (diff) | |
| parent | 42c456ff8116fb0373c5cf6df54d34cb343b058e (diff) | |
| download | git-fc0e3e02c9c7919c03c1def260d83fc96b4f4b3e.tar.gz | |
Merge branch 'rs/mergesort'
Bitop fix for platforms whose "long" is 32-bit.
* rs/mergesort:
mergesort: avoid left shift overflow
| -rw-r--r-- | mergesort.c | 2 |
1 files changed, 1 insertions, 1 deletions
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++; |