From: "Philip Oakley" <philipoakley@iee.org>
To: "Stefan Beller" <sbeller@google.com>
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
"Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>,
<git@vger.kernel.org>
Subject: Re: [PATCHv2 3/4] bundle: don't leak an fd in case of early return
Date: Fri, 1 Apr 2016 08:26:18 +0100 [thread overview]
Message-ID: <55AD693FD6AC44119B8368ABC36FB1A9@PhilipOakley> (raw)
In-Reply-To: CAGZ79kYMxJdh_8n8zaaaEQP_BqWfS12JEry1MHkYqwQPJTWTNw@mail.gmail.com
From: "Stefan Beller" <sbeller@google.com>
> On Thu, Mar 31, 2016 at 12:00 PM, Philip Oakley <philipoakley@iee.org>
> wrote:
>> From: "Stefan Beller" <sbeller@google.com>
>>>
>>> In successful operation `write_pack_data` will close the `bundle_fd`,
>>> but when we exit early, we need to take care of the file descriptor
>>> as well as the lock file ourselves. The lock file may be deleted at the
>>> end of running the program, but we are in library code, so we should
>>> not rely on that.
>>>
>>> Helped-by: Jeff King <peff@peff.net>
>>> Signed-off-by: Stefan Beller <sbeller@google.com>
>>
>>
>> Has this been tested on Windows? I had a similar problem very recently
>> https://groups.google.com/forum/#!msg/git-for-windows/6LPxf9xZKhI/-s7XD18yCwAJ
>> where a bad rev-list-arg would cause the `bundle create` to die, and, on
>> windows, leave the incomplete bundle file locked.
>>
>> dscho suggested one possible solution for that, but I haven't had any
>> time
>> to try any patches.
>
> I think with Jeffs suggestion to only rollback the lock in case of
> (!bundle_to_stdout)
> we're not making it worse. I do not have a Windows machine at hand to test
> it :(
Thant's fine. I just wanted to make folks aware of the problem so it doesn't
get worse.
It looks like the cause is that the
bundle.c:compute_and_write_prerequisites(), which includes parsing the
arg-list (and die on bad arg), is called after the creation and locking of
the bundle file descriptor and header, thus leaving it hanging on Windows.
--
Philip
next prev parent reply other threads:[~2016-04-01 7:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 17:05 [PATCHv2 0/4] Some cleanups Stefan Beller
2016-03-30 17:05 ` [PATCHv2 1/4] notes: don't leak memory in git_config_get_notes_strategy Stefan Beller
2016-03-30 17:32 ` Eric Sunshine
2016-03-30 21:07 ` Junio C Hamano
2016-03-30 21:10 ` Stefan Beller
2016-03-31 1:06 ` Jeff King
2016-03-31 2:59 ` Junio C Hamano
2016-03-30 17:05 ` [PATCHv2 2/4] abbrev_sha1_in_line: don't leak memory Stefan Beller
2016-03-30 17:35 ` Eric Sunshine
2016-03-30 17:05 ` [PATCHv2 3/4] bundle: don't leak an fd in case of early return Stefan Beller
2016-03-30 17:23 ` Jeff King
2016-03-30 17:41 ` Eric Sunshine
2016-03-31 17:47 ` Stefan Beller
2016-03-31 19:00 ` Philip Oakley
2016-04-01 0:25 ` Stefan Beller
2016-04-01 7:26 ` Philip Oakley [this message]
2016-03-30 17:05 ` [PATCHv2 4/4] credential-cache, send_request: close fd when done Stefan Beller
2016-03-30 17:25 ` [PATCHv2 0/4] Some cleanups Jeff King
2016-03-30 17:32 ` Stefan Beller
2016-03-30 17:38 ` Jeff King
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=55AD693FD6AC44119B8368ABC36FB1A9@PhilipOakley \
--to=philipoakley@iee.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--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).