From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: lars.schneider@autodesk.com, git@vger.kernel.org,
t.gummerer@gmail.com, jrnieder@gmail.com,
Lars Schneider <larsxschneider@gmail.com>
Subject: Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files
Date: Thu, 5 Oct 2017 07:26:58 -0400 [thread overview]
Message-ID: <20171005112658.p7hohhtkdkcapwe6@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqk2097sge.fsf@gitster.mtv.corp.google.com>
On Thu, Oct 05, 2017 at 08:19:13PM +0900, Junio C Hamano wrote:
> > diff --git a/entry.c b/entry.c
> > index 1c7e3c11d5..5dab656364 100644
> > --- a/entry.c
> > +++ b/entry.c
> > @@ -304,7 +304,7 @@ static int write_entry(struct cache_entry *ce,
> > ce->name, new, size, &buf, dco);
> > if (ret && string_list_has_string(&dco->paths, ce->name)) {
> > free(new);
> > - goto finish;
> > + goto delayed;
> > }
> > } else
> > ret = convert_to_working_tree(
>
> This is unrelated to the main topic of this patch, but we see this
> just before the precontext of this hunk:
>
> if (dco && dco->state != CE_NO_DELAY) {
> /* Do not send the blob in case of a retry. */
> if (dco->state == CE_RETRY) {
> new = NULL;
> size = 0;
> }
> ret = async_convert_to_working_tree(
> ce->name, new, size, &buf, dco);
>
> Aren't we leaking "new" in that CE_RETRY case?
Yes, it certainly looks like it. Wouldn't we want to avoid reading the
file from disk entirely in that case?
I.e., I think free(new) is sufficient to fix the leak you mentioned. But
I think we'd want to protect the read_blob_entry() call at the top of
the case with a check for dco->state == CE_RETRY.
-Peff
next prev parent reply other threads:[~2017-10-05 11:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 10:44 [PATCH v1 0/2] fix temporary garbage in the cache entry lars.schneider
2017-10-05 10:44 ` [PATCH v1 1/2] entry.c: update cache entry only for existing files lars.schneider
2017-10-05 11:12 ` Jeff King
2017-10-05 11:19 ` Junio C Hamano
2017-10-05 11:26 ` Jeff King [this message]
2017-10-05 23:01 ` Junio C Hamano
2017-10-06 4:54 ` Jeff King
2017-10-08 21:37 ` Lars Schneider
2017-10-09 17:47 ` Jeff King
2017-10-09 17:48 ` [PATCH 1/3] write_entry: fix leak when retrying delayed filter Jeff King
2017-10-10 0:00 ` Junio C Hamano
2017-10-10 9:23 ` Simon Ruderich
2017-10-10 9:25 ` Jeff King
2017-10-10 9:49 ` Simon Ruderich
2017-10-09 17:48 ` [PATCH 2/3] write_entry: avoid reading blobs in CE_RETRY case Jeff King
2017-10-10 0:00 ` Junio C Hamano
2017-10-09 17:50 ` [PATCH 3/3] write_entry: untangle symlink and regular-file cases Jeff King
2017-10-10 0:03 ` Junio C Hamano
2017-10-05 10:44 ` [PATCH v1 2/2] entry.c: check if file exists after checkout lars.schneider
2017-10-05 11:23 ` Jeff King
2017-10-06 4:26 ` Junio C Hamano
2017-10-06 4:56 ` Jeff King
2017-10-06 6:03 ` Junio C Hamano
2017-10-06 6:05 ` Jeff King
2017-10-06 7:58 ` Junio C Hamano
2017-10-08 21:41 ` Lars Schneider
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171005112658.p7hohhtkdkcapwe6@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=lars.schneider@autodesk.com \
--cc=larsxschneider@gmail.com \
--cc=t.gummerer@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).