From: "René Scharfe" <l.s.r@web.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Philip Oakley <philipoakley@iee.email>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] mergesort: avoid left shift overflow
Date: Fri, 19 Nov 2021 18:15:34 +0100 [thread overview]
Message-ID: <fb70a801-369b-c1b1-457b-bab06688b2bc@web.de> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2111191750400.63@tvgsbejvaqbjf.bet>
Am 19.11.21 um 17:51 schrieb Johannes Schindelin:
> Hi Philip,
>
> On Thu, 18 Nov 2021, Philip Oakley wrote:
>
>> I already had this locally as part of an MSVC (Visual Studio) fix for
>> the various C4334 warnings.
>>
>> The other cases are in object-file.c, diffcore-delta.c (2 occurrences) ,
>> and repack.c.
>>
>> My patches are in https://github.com/PhilipOakley/git/tree/oneU_t
Good warning, that. And scary stuff.
builtin/repack.c shifts by 5, diffcore-delta.c by at most 17 IIUC, and
object-file.c by at most 31, which should all be safe. Shifting by 32
or more would push the 1 off the right end, leaving only a surprising 0.
Phew! Definitely worth fixing regardless.
> How about rebasing the remaining patches from
> https://github.com/git-for-windows/git/compare/main...PhilipOakley:oneU_t
> on top of `rs/mergesort` and then submitting them, to avoid duplicate
> efforts?
That would be nice. I'd also don't mind if Junio took the whole set
incl. the mergesort.c change instead.
René
next prev parent reply other threads:[~2021-11-19 17:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 23:19 [PATCH] mergesort: avoid left shift overflow René Scharfe
2021-11-16 14:08 ` 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 [this message]
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=fb70a801-369b-c1b1-457b-bab06688b2bc@web.de \
--to=l.s.r@web.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.email \
/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).