From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Adam Spiers" <git@adamspiers.org>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Stephen Boyd" <sboyd@codeaurora.org>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 1/3] read-cache: plug a few leaks
Date: Thu, 30 May 2013 08:34:19 -0500 [thread overview]
Message-ID: <1369920861-30030-2-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369920861-30030-1-git-send-email-felipe.contreras@gmail.com>
We don't free 'istate->cache' properly.
Apparently 'initialized' doesn't really mean initialized, but loaded, or
rather 'not-empty', and the cache can be used even if it's not
'initialized', so we can't rely on this variable to keep track of the
'istate->cache'.
So assume it always has data, and free it before overwriting it.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
read-cache.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 04ed561..e5dc96f 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1449,6 +1449,7 @@ int read_index_from(struct index_state *istate, const char *path)
istate->version = ntohl(hdr->hdr_version);
istate->cache_nr = ntohl(hdr->hdr_entries);
istate->cache_alloc = alloc_nr(istate->cache_nr);
+ free(istate->cache);
istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
istate->initialized = 1;
@@ -1510,6 +1511,9 @@ int discard_index(struct index_state *istate)
for (i = 0; i < istate->cache_nr; i++)
free(istate->cache[i]);
+ free(istate->cache);
+ istate->cache = NULL;
+ istate->cache_alloc = 0;
resolve_undo_clear_index(istate);
istate->cache_nr = 0;
istate->cache_changed = 0;
--
1.8.3.rc3.312.g47657de
next prev parent reply other threads:[~2013-05-30 13:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 13:34 [PATCH v2 0/3] cherry-pick: fix memory leaks Felipe Contreras
2013-05-30 13:34 ` Felipe Contreras [this message]
2013-05-30 15:13 ` [PATCH v2 1/3] read-cache: plug a few leaks René Scharfe
2013-05-31 3:40 ` Felipe Contreras
2013-05-31 8:22 ` Felipe Contreras
2013-05-30 13:34 ` [PATCH v2 2/3] unpack-trees: plug a memory leak Felipe Contreras
2013-05-30 13:40 ` Stefano Lattarini
2013-05-30 13:34 ` [PATCH v2 3/3] unpack-trees: free created cache entries Felipe Contreras
2013-05-30 14:49 ` René Scharfe
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=1369920861-30030-2-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@adamspiers.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=sboyd@codeaurora.org \
/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).