All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 7/7] commit-tree: free commit message before exiting
Date: Sat, 2 Oct 2010 03:41:00 -0500	[thread overview]
Message-ID: <20101002084100.GH29638@burratino> (raw)
In-Reply-To: <20101002082752.GA29638@burratino>

This buffer is freed by the C runtime when commit-tree exits moments
later, but freeing it explicitly should hopefully make this code
easier to reuse (in addition to making valgrind quieter).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
That's the end of the series.  Thanks for reading.

 builtin/commit-tree.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 87f0591..732f895 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -56,10 +56,12 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 	if (strbuf_read(&buffer, 0, 0) < 0)
 		die_errno("git commit-tree: failed to read");
 
-	if (!commit_tree(buffer.buf, tree_sha1, parents, commit_sha1, NULL)) {
-		printf("%s\n", sha1_to_hex(commit_sha1));
-		return 0;
-	}
-	else
+	if (commit_tree(buffer.buf, tree_sha1, parents, commit_sha1, NULL)) {
+		strbuf_release(&buffer);
 		return 1;
+	}
+
+	printf("%s\n", sha1_to_hex(commit_sha1));
+	strbuf_release(&buffer);
+	return 0;
 }
-- 
1.7.2.3

  parent reply	other threads:[~2010-10-02  8:44 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-09  9:48 [PATCH] memory leak reported by valgrind Ivan Kanis
2010-08-09 19:37 ` Junio C Hamano
2010-08-09 20:19   ` Erik Faye-Lund
2010-08-09 20:29     ` Alex Riesen
2010-08-10  3:26   ` Jonathan Nieder
2010-08-10  3:28     ` [PATCH/RFC 1/3] core: Stop leaking ondisk_cache_entrys Jonathan Nieder
2010-08-10  3:32     ` [PATCH/RFC 2/3] write-tree: Avoid leak when index refers to an invalid object Jonathan Nieder
2010-08-10  3:33     ` [PATCH/RFC 3/3] read-tree: stop leaking tree objects Jonathan Nieder
2010-10-02  8:27     ` [PATCH/RFC 0/7] Re: [PATCH] memory leak reported by valgrind Jonathan Nieder
2010-10-02  8:31       ` [PATCH 1/7] init: plug tiny one-time memory leak Jonathan Nieder
2010-10-03 23:46         ` Junio C Hamano
2010-10-04  4:34           ` [PATCH v2] " Jonathan Nieder
2010-10-02  8:32       ` [PATCH 2/7] lockfile: introduce alloc_lock_file() to avoid valgrind noise Jonathan Nieder
2010-10-02 16:30         ` Andreas Ericsson
2010-10-02 16:43           ` Jonathan Nieder
2010-10-06 20:10         ` Junio C Hamano
2010-10-06 20:21           ` Jonathan Nieder
2010-10-06 21:45             ` Junio C Hamano
2010-10-06 22:17               ` Jonathan Nieder
2010-10-02  8:35       ` [PATCH 3/7] environment.c: remove unused variable Jonathan Nieder
2010-10-02  8:36       ` [PATCH 4/7] setup: make sure git dir path is in a permanent buffer Jonathan Nieder
2010-10-04  9:25         ` Nguyen Thai Ngoc Duy
2010-10-02  8:38       ` [PATCH 5/7] Introduce malloc/strdup/pathdup variants for permanent allocations Jonathan Nieder
2010-10-02  8:39       ` [PATCH 6/7] environment: use alloc_permanent() for computed git_dir and co Jonathan Nieder
2010-10-02  8:41       ` Jonathan Nieder [this message]
2010-10-02 18:14         ` [PATCH 7/7] commit-tree: free commit message before exiting Sverre Rabbelier
2010-10-02 18:26           ` Jonathan Nieder
2010-10-02 20:12             ` Sverre Rabbelier
2010-10-02 20:50               ` Jonathan Nieder
2010-10-04  0:31         ` Junio C Hamano
2010-10-04  4:18           ` Jonathan Nieder
2010-10-04  7:55             ` Junio C Hamano
2010-10-04  7:56               ` 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=20101002084100.GH29638@burratino \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.