From: Jeff King <peff@peff.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
sahlberg@google.com, gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH 3/4] lock_ref_sha1_basic: simplify error code path
Date: Tue, 18 Nov 2014 21:04:52 -0500 [thread overview]
Message-ID: <20141119020451.GA2734@peff.net> (raw)
In-Reply-To: <20141119020009.GR6527@google.com>
On Tue, Nov 18, 2014 at 06:00:09PM -0800, Jonathan Nieder wrote:
> Jeff King wrote:
>
> > For most errors, we jump to a goto label that unlocks the
> > ref and returns NULL. However, in none of these error paths
> > would we ever have actually locked the ref. By the time we
> > actually take the lock, we follow a different path that does
> > not ever hit this goto (we rely on verify_lock to unlock if
> > it finds an error).
> [...]
> > refs.c | 12 ++++--------
> > 1 file changed, 4 insertions(+), 8 deletions(-)
>
> Wouldn't this leak lock (in all cases) and lock->ref_name and
> lock->orig_ref_name (on safe_create_leading_directories failure)?
Ah, you're right. I totally missed that unlock_ref is not just about
unlocking, but about free()ing. We do need to keep the goto/unlock.
Hmph. Should we just abandon my series in favor of taking Ronnie's
original patch, then? We can apply the "save/restore errno in error()"
patch independently if we like.
-Peff
next prev parent reply other threads:[~2014-11-19 2:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 23:17 [PATCH] refs.c: handle locking failure during transaction better Stefan Beller
2014-11-18 23:34 ` Stefan Beller
2014-11-19 1:13 ` Stefan Beller
2014-11-19 1:35 ` [PATCH 0/4] error cleanups in lock_ref_sha1_basic Jeff King
2014-11-19 1:37 ` [PATCH 1/4] error: save and restore errno Jeff King
2014-11-19 1:41 ` Stefan Beller
2014-11-19 1:43 ` Jonathan Nieder
2014-11-19 1:47 ` Jeff King
2014-11-19 18:14 ` Junio C Hamano
2014-11-19 18:28 ` Jeff King
2014-11-19 1:37 ` [PATCH 2/4] lock_ref_sha1_basic: simplify errno handling Jeff King
2014-11-19 1:54 ` Jonathan Nieder
2014-11-21 9:25 ` Michael Haggerty
2014-11-19 1:37 ` [PATCH 3/4] lock_ref_sha1_basic: simplify error code path Jeff King
2014-11-19 2:00 ` Jonathan Nieder
2014-11-19 2:04 ` Jeff King [this message]
2014-11-19 2:07 ` Jonathan Nieder
2014-11-19 21:41 ` Junio C Hamano
2014-11-19 22:28 ` Jeff King
2014-11-19 22:34 ` Junio C Hamano
2014-11-19 22:36 ` Jeff King
2014-11-20 1:07 ` Jonathan Nieder
2014-11-19 1:41 ` [PATCH 4/4] lock_ref_sha1_basic: do not die on locking errors Jeff King
2014-11-19 2:05 ` Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141119020451.GA2734@peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sahlberg@google.com \
--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.
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 NNTP newsgroup(s).