read-cache: fix memleak
`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 - the `ce` given as the parameter, when it was up-to-date; - a new updated cache entry which is allocated to new memory; or - a NULL when refreshing failed. In the latter two cases, the original cache-entry `ce` is not used and needs to be freed. The rule can be expressed as "if the return value from refresh is different from the original ce, ce is no longer used." Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Mar 23, 2015 at 10:57 UTC
915e44c6357f3bd9d5fa498a201872c4367302d3
1 file changed
+2
-5
read-cache.c
+2
-5
@@ -748,12 +748,9 @@ struct cache_entry *make_cache_entry(unsigned int mode,
748
ce->ce_mode = create_ce_mode(mode);
749
750
ret = refresh_cache_entry(ce, refresh_options);
751
- if (!ret) {
751
+ if (ret != ce)
752
free(ce);
753
- return NULL;
754
- } else {
755
- return ret;
756
- }
753
+ return ret;
754
}
755
756
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)