All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ivan Kanis <expire-by-2010-08-14@kanis.fr>, git@vger.kernel.org
Subject: [PATCH/RFC 3/3] read-tree: stop leaking tree objects
Date: Mon, 9 Aug 2010 22:33:44 -0500	[thread overview]
Message-ID: <20100810033344.GD2386@burratino> (raw)
In-Reply-To: <20100810032647.GA2386@burratino>

The underlying problem is that the fill_tree_descriptor()
API is easy to misuse, and this patch does not fix that.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 unpack-trees.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index 8cf0da3..f561d88 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -329,6 +329,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long
 {
 	int i, ret, bottom;
 	struct tree_desc t[MAX_UNPACK_TREES];
+	void *buf[MAX_UNPACK_TREES];
 	struct traverse_info newinfo;
 	struct name_entry *p;
 
@@ -346,12 +347,16 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long
 		const unsigned char *sha1 = NULL;
 		if (dirmask & 1)
 			sha1 = names[i].sha1;
-		fill_tree_descriptor(t+i, sha1);
+		buf[i] = fill_tree_descriptor(t+i, sha1);
 	}
 
 	bottom = switch_cache_bottom(&newinfo);
 	ret = traverse_trees(n, t, &newinfo);
 	restore_cache_bottom(&newinfo, bottom);
+
+	for (i = 0; i < n; i++)
+		free(buf[i]);
+
 	return ret;
 }
 
-- 
1.7.2.1.544.ga752d.dirty

  parent reply	other threads:[~2010-08-10  3:35 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     ` Jonathan Nieder [this message]
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       ` [PATCH 7/7] commit-tree: free commit message before exiting Jonathan Nieder
2010-10-02 18:14         ` 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=20100810033344.GD2386@burratino \
    --to=jrnieder@gmail.com \
    --cc=expire-by-2010-08-14@kanis.fr \
    --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.