From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, John Keeping <john@keeping.me.uk>,
sunshine@sunshineco.com
Subject: Re: [PATCHv3 6/6] entry.c: fix a memleak
Date: Mon, 30 Mar 2015 22:41:53 -0700 [thread overview]
Message-ID: <xmqqoan9soym.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1427764931-27745-7-git-send-email-sbeller@google.com> (Stefan Beller's message of "Mon, 30 Mar 2015 18:22:11 -0700")
Stefan Beller <sbeller@google.com> writes:
> From: John Keeping <john@keeping.me.uk>
>
> stream_blob_to_fd() always frees the filter now, so there is no memory
> leak in entry.c:152 just before the `goto finish`.
>
> Signed-off-by: John Keeping <john@keeping.me.uk>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
> I added Johns signoff here tentatively, John can you confirm the sign off?
>
> streaming.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/streaming.c b/streaming.c
> index 2ff036a..811fcc2 100644
> --- a/streaming.c
> +++ b/streaming.c
> @@ -507,8 +507,11 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f
> int result = -1;
>
> st = open_istream(sha1, &type, &sz, filter);
> - if (!st)
> + if (!st) {
> + if (filter)
> + free_stream_filter(filter);
> return result;
> + }
I think this one is fine. I see you moved the callsite to free this
thing from entry.c down to streaming (stream_blob_to_fd()), which
means you would need to adjust the title of the change, too.
It somewhat feels dirty that we free what the caller gave us, but
given that closing a filtered stream frees the filter at the end,
I think this is the right place to discard the filter. In essence,
the overall use of the API in this code is equivalent to
filter = ... prepare a filter ...
if (open_istream(... filter) == OK) {
... use filter ...
close_istream(); /* which frees the filter */
} else {
/* we failed to free filter here without the patch */
free_stream_filter(filter);
}
so the patch makes sense.
We may want to teach free_stream_filter() that a request to free a
NULL filter is OK, though. That would be a separate clean-up topic.
> if (type != OBJ_BLOB)
> goto close_and_exit;
> for (;;) {
next prev parent reply other threads:[~2015-03-31 5:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-31 1:22 [PATCHv3 0/6] Memory leaks once again Stefan Beller
2015-03-31 1:22 ` [PATCHv3 1/6] shallow: fix a memleak Stefan Beller
2015-03-31 2:52 ` Eric Sunshine
2015-03-31 1:22 ` [PATCHv3 2/6] line-log.c: " Stefan Beller
2015-03-31 1:22 ` [PATCHv3 3/6] " Stefan Beller
2015-03-31 4:42 ` Torsten Bögershausen
2015-03-31 5:06 ` Junio C Hamano
2015-03-31 5:35 ` Stefan Beller
2015-03-31 19:03 ` Junio C Hamano
2015-03-31 1:22 ` [PATCHv3 4/6] wt-status.c: " Stefan Beller
2015-03-31 1:22 ` [PATCHv3 5/6] pack-bitmap.c: " Stefan Beller
2015-03-31 3:32 ` Jeff King
2015-03-31 1:22 ` [PATCHv3 6/6] entry.c: " Stefan Beller
2015-03-31 5:41 ` Junio C Hamano [this message]
2015-03-31 8:36 ` John Keeping
2015-03-31 19:12 ` 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:
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=xmqqoan9soym.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.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).