Re: [BUG] diffcore-rename with duplicate tree entries can segfault

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 25, 2015, 21:50 UTC
Message-ID: <xmqq1tldoe35.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20150225214032.GA32295@peff.net>

Jeff King <peff@peff.net> writes:

> But we can also do that with a hash table, or an auxiliary sorted array.
> And sure enough, that's exactly what the rename_dst array is.
> ...
> which I think is a pretty simple and sane fix.

Yeah, good observation.

Show 10 quoted lines

> So to go forward, I'm happy to prepare a patch, but I'd like to know:
>
>   1. Does something like the above look reasonable to you (I'd probably
>      refactor it to avoid the bizarre return value semantics from
>      locate_rename_dst, though)?
>
>   2. If so, do you want something minimal like what's above, or do you
>      mind if I build it on top of a hashmap conversion? I suspect the
>      logic may also end up more clear with the hashmap (since inserting
>      versus lookup will be more distinct in the callers).

No, I don't mind. The diff-b-m topic seems to need a lot deeper rethink than I originally anticipated anyway, and it can wait for a clean-up to use hashmap to stabilize.

Thanks.