[PATCH v2 1/3] read-cache: plug a few leaks
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- May 30, 2013, 13:34 UTC
- Message-ID
- <1369920861-30030-2-git-send-email-felipe.contreras@gmail.com>
- 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