From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: "Erik Elfström" <erik.elfstrom@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v5 1/5] setup: add gentle version of read_gitfile
Date: Wed, 29 Apr 2015 18:35:09 -0700 [thread overview]
Message-ID: <xmqq383i4cvm.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAGZ79kY95mxKWwTPSB0S5c0eux1ButhuvGz91GQUz8WXt1w18w@mail.gmail.com> (Stefan Beller's message of "Wed, 29 Apr 2015 16:47:33 -0700")
Stefan Beller <sbeller@google.com> writes:
[administrivia: cull the parts of the original from your quote if
you are not addressing them]
>> fd = open(path, O_RDONLY);
>> - if (fd < 0)
>> - die_errno("Error opening '%s'", path);
>> + if (fd < 0) {
>> + error_code = READ_GITFILE_ERR_OPEN_FAILED;
>> + goto cleanup_return;
>> + }
>> buf = xmalloc(st.st_size + 1);
>> len = read_in_full(fd, buf, st.st_size);
>> close(fd);
>> - if (len != st.st_size)
>> - die("Error reading %s", path);
>> + if (len != st.st_size) {
>> + error_code = READ_GITFILE_ERR_READ_FAILED;
>> + goto cleanup_return;
>
> Sorry for the late review.
>
> So when you jump from here to the cleanup, there is no close(fd) involved?
> I think there are code paths now, which leak fd.
This one comes _after_ close(fd), so there is no issue.
A later step does introduce an issue; see $gmane/267975.
Thanks.
next prev parent reply other threads:[~2015-04-30 1:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-25 9:06 [PATCH v4 0/5] Improving performance of git clean Erik Elfström
2015-04-25 9:06 ` [PATCH v4 1/5] setup: add gentle version of read_gitfile Erik Elfström
2015-04-25 16:51 ` Junio C Hamano
2015-04-25 16:54 ` Junio C Hamano
2015-04-25 9:06 ` [PATCH v4 2/5] setup: sanity check file size in read_gitfile_gently Erik Elfström
2015-04-25 16:47 ` Junio C Hamano
2015-04-25 17:59 ` Erik Elfström
2015-04-26 4:29 ` Junio C Hamano
2015-04-26 6:49 ` [PATCH v5 0/5] Improving performance of git clean Erik Elfström
2015-04-26 6:49 ` [PATCH v5 1/5] setup: add gentle version of read_gitfile Erik Elfström
2015-04-28 6:17 ` Jeff King
2015-04-28 20:07 ` erik elfström
2015-04-28 20:19 ` Jeff King
2015-04-28 20:34 ` Jonathan Nieder
2015-04-28 20:36 ` Jeff King
2015-04-28 20:42 ` Jonathan Nieder
2015-04-28 20:48 ` Jeff King
2015-04-28 21:06 ` Jonathan Nieder
2015-04-28 23:34 ` Junio C Hamano
2015-04-29 23:47 ` Stefan Beller
2015-04-30 1:35 ` Junio C Hamano [this message]
2015-04-26 6:49 ` [PATCH v5 2/5] setup: sanity check file size in read_gitfile_gently Erik Elfström
2015-04-28 6:02 ` Jeff King
2015-04-28 7:21 ` Windows path limites, was " Johannes Schindelin
2015-04-28 15:33 ` Doug Kelly
2015-04-28 16:20 ` Windows path limits, " Johannes Schindelin
2015-04-28 19:28 ` erik elfström
2015-04-29 15:42 ` Junio C Hamano
2015-04-26 6:49 ` [PATCH v5 3/5] t7300: add tests to document behavior of clean and nested git Erik Elfström
2015-04-26 6:49 ` [PATCH v5 4/5] p7300: add performance tests for clean Erik Elfström
2015-04-28 6:33 ` Jeff King
2015-04-28 19:36 ` erik elfström
2015-04-26 6:49 ` [PATCH v5 5/5] clean: improve performance when removing lots of directories Erik Elfström
2015-04-28 6:24 ` Jeff King
2015-04-28 20:31 ` erik elfström
2015-04-25 9:06 ` [PATCH v4 3/5] t7300: add tests to document behavior of clean and nested git Erik Elfström
2015-04-25 9:06 ` [PATCH v4 4/5] p7300: add performance tests for clean Erik Elfström
2015-04-25 9:06 ` [PATCH v4 5/5] clean: improve performance when removing lots of directories Erik Elfström
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=xmqq383i4cvm.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=erik.elfstrom@gmail.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.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).