Commit bc1c2caa authored by Stefan Beller's avatar Stefan Beller Committed by Junio C Hamano

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's avatarStefan Beller <>
Signed-off-by: default avatarJunio C Hamano <>
parent 64a03e97
......@@ -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) {
return NULL;
} else {
return ret;
int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment