[PATCH 1/2] read-cache: fix memleak
- From
Stefan Beller <sbeller@google.com>
- Date
- Mar 23, 2015, 17:57 UTC
- Message-ID
- <1427133432-26703-1-git-send-email-sbeller@google.com>
- In-Reply-To
- <CAGZ79kY=b3=ppmB+eJOAgcUec7hq+ycJiCvBzkTc7U78Mgog_g@mail.gmail.com>
`ce` is allocated in make_cache_entry and should be freed if it is not used any more. refresh_cache_entry as a wrapper around refresh_cache_ent will either return `ce` or a new updated cache entry which is allocated to new memory. In that case we need to free `ce` ourselfs.
Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Stefan Beller <sbeller@google.com> --- read-cache.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/read-cache.c b/read-cache.c index 60abec6..a102565 100644 --- a/read-cache.c +++ b/read-cache.c @@ -746,12 +746,9 @@ struct cache_entry *make_cache_entry(unsigned int mode, ce->ce_mode = create_ce_mode(mode); ret = refresh_cache_entry(ce, refresh_options); - if (!ret) { + if (ret != ce) free(ce); - return NULL; - } else { - return ret; - } + return ret; } int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
-- 2.3.0.81.gc37f363