mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jinoh Kang <>
To: Johannes Schindelin <>
Cc: Junio C Hamano <>,
Subject: Re: [PATCH v3] diff: make diff_free_filespec_data accept NULL
Date: Tue, 10 Nov 2020 13:16:56 +0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On 11/10/20 12:08 PM, Johannes Schindelin wrote:
> Hi Jinoh,
> On Fri, 6 Nov 2020, Jinoh Kang wrote:
>> Commit 3aef54e8b8 ("diff: munmap() file contents before running external
>> diff") introduced calls to diff_free_filespec_data in
>> run_external_diff, which may pass NULL pointers.
> Sorry for the breakage!

No worries. Those functions were indeed confusing...

> Maybe the commit message could talk a bit about the circumstances when
> this happens? Of course, I (and every other reader...) could analyze your
> patch to guess what it is that triggers the bug, but it's really a good
> use of the commit message to describe it in plain English.

Agreed. The v1 PATCH, which was off-list, did explain that NULL filespecs
are used to indicate unmerged files (i.e. with unresolved conflicts).

>> Fix this and prevent any such bugs in the future by making
>> `diff_free_filespec_data(NULL)` a no-op.
>> Fixes: 3aef54e8b8 ("diff: munmap() file contents before running external diff")
> I am unaware of any other commit having a `Fixes:` trailer in the commit
> message. In any case, I would have expected `Fixes:` to mention a ticket
> or a bug report, not the commit that fixed _a separate_ issue (but
> unfortunately introduced this regression).

Sorry for this one; somehow I didn't notice that git and linux use
different conventions.

Jinoh Kang

  reply	other threads:[~2020-11-10 13:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <>
     [not found] ` <>
2020-11-06 17:02   ` [PATCH v2] diff: handle NULL filespecs in run_external_diff Jinoh Kang
2020-11-06 17:14     ` [PATCH v3] diff: make diff_free_filespec_data accept NULL Jinoh Kang
2020-11-10 12:08       ` Johannes Schindelin
2020-11-10 13:16         ` Jinoh Kang [this message]
2020-11-10 14:21         ` Jinoh Kang
2020-11-10 17:02         ` Junio C Hamano
2020-11-10 14:06       ` [PATCH v4] " Jinoh Kang
2020-11-10 15:38         ` Johannes Schindelin
2020-11-11 12:30           ` Jinoh Kang
2020-11-11 16:28             ` Johannes Schindelin
2020-11-10 19:41         ` Junio C Hamano
2020-11-11 12:15         ` [PATCH v5] " Jinoh Kang
2020-11-11 16:27           ` Johannes Schindelin
2020-11-11 19:18             ` Junio C Hamano
2020-11-06 19:18     ` [PATCH v2] diff: handle NULL filespecs in run_external_diff Junio C Hamano

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).