From bc1c2caa7397e7e462f0cc7631a40f6e7cd480ab Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 17 Feb 2015 10:06:14 -0800 Subject: [PATCH] read-cache.c: free cache entry when refreshing fails This fixes a memory leak when building the cache entries as refresh_cache_entry may decide to return NULL, but it does not free the cache entry structure which was passed in as an argument. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- read-cache.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/read-cache.c b/read-cache.c index ee07cd610a..565546db50 100644 --- a/read-cache.c +++ b/read-cache.c @@ -701,7 +701,7 @@ struct cache_entry *make_cache_entry(unsigned int mode, unsigned int refresh_options) { int size, len; - struct cache_entry *ce; + struct cache_entry *ce, *ret; if (!verify_path(path)) { error("Invalid path '%s'", path); @@ -718,7 +718,13 @@ struct cache_entry *make_cache_entry(unsigned int mode, ce->ce_namelen = len; ce->ce_mode = create_ce_mode(mode); - return refresh_cache_entry(ce, refresh_options); + ret = refresh_cache_entry(ce, refresh_options); + if (!ret) { + free(ce); + return NULL; + } else { + return ret; + } } int ce_same_name(const struct cache_entry *a, const struct cache_entry *b) -- 2.11.4.GIT