All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, gitster@pobox.com, mhagger@alum.mit.edu,
	loic@dachary.org
Subject: Re: [PATCH 5/6] refs.c: write to a lock file only once
Date: Wed, 21 Jan 2015 18:44:28 -0500	[thread overview]
Message-ID: <20150121234428.GD11115@peff.net> (raw)
In-Reply-To: <1421882625-916-6-git-send-email-sbeller@google.com>

On Wed, Jan 21, 2015 at 03:23:44PM -0800, Stefan Beller wrote:

> +	const char *sha1_lf;
>  
>  	if (!lock) {
>  		errno = EINVAL;
> @@ -3104,8 +3104,9 @@ static int write_ref_sha1(struct ref_lock *lock,
>  		errno = EINVAL;
>  		return -1;
>  	}
> -	if (write_in_full_to_lockfile(lock->lk, sha1_to_hex(sha1), 40) != 40 ||
> -	    write_in_full_to_lockfile(lock->lk, &term, 1) != 1 ||
> +
> +	sha1_lf = xstrfmt("%s\n",  sha1_to_hex(sha1));
> +	if (write_in_full_to_lockfile(lock->lk, sha1_lf, 41) != 41 ||
>  	    close_ref(lock) < 0) {
>  		int save_errno = errno;
>  		error("Couldn't write %s", lock->lk->filename.buf);
> @@ -3113,6 +3114,7 @@ static int write_ref_sha1(struct ref_lock *lock,
>  		errno = save_errno;
>  		return -1;
>  	}
> +	free((void*)sha1_lf);

It looks like you leak sha1_lf in the error code path here.

It's a shame that we must allocate at all, when we are really just
passing through to a buffer. Lockfiles have a "FILE *" pointer these
days. Could we just allow:

  lockfile_printf(lock->lk, "%s\n", sha1_to_hex(sha1));

or similar?

-Peff

  reply	other threads:[~2015-01-21 23:44 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-21 23:23 [PATCHv1 0/6] Fix bug in large transactions Stefan Beller
2015-01-21 23:23 ` [PATCH 1/6] update-ref: Test handling large transactions properly Stefan Beller
2015-01-21 23:34   ` Jeff King
2015-01-21 23:23 ` [PATCH 2/6] refs.c: remove lock_fd from struct ref_lock Stefan Beller
2015-01-21 23:23 ` [PATCH 3/6] refs.c: replace write_str_in_full by write_in_full Stefan Beller
2015-01-21 23:38   ` Jeff King
2015-01-21 23:44     ` Stefan Beller
2015-01-21 23:52       ` Jeff King
2015-01-21 23:23 ` [PATCH 4/6] refs.c: Have a write_in_full_to_lock_file wrapping write_in_full Stefan Beller
2015-01-21 23:40   ` Jeff King
2015-01-21 23:23 ` [PATCH 5/6] refs.c: write to a lock file only once Stefan Beller
2015-01-21 23:44   ` Jeff King [this message]
2015-01-21 23:23 ` [PATCH 6/6] refs.c: enable large transactions Stefan Beller
2015-01-21 23:47 ` [PATCHv1 0/6] Fix bug in " Jeff King
2015-01-22  8:00   ` Junio C Hamano
2015-01-22 17:52     ` Stefan Beller
2015-01-22 17:58       ` Junio C Hamano
2015-01-22 18:29         ` Stefan Beller

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=20150121234428.GD11115@peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=loic@dachary.org \
    --cc=mhagger@alum.mit.edu \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.