diff options
| author | Karsten Blees <karsten.blees@gmail.com> | 2013-11-14 20:24:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-18 13:04:25 -0800 |
| commit | 5699d17ee0949e6c01311a03dcfce485fcdd9b1a (patch) | |
| tree | f12588558bd275204e058f2f5c7b88e003edea9e /builtin/rm.c | |
| parent | 6bb69077b74b792ddef66e372c86e66dea8e449b (diff) | |
| download | git-5699d17ee0949e6c01311a03dcfce485fcdd9b1a.tar.gz git-5699d17ee0949e6c01311a03dcfce485fcdd9b1a.tar.xz | |
read-cache.c: fix memory leaks caused by removed cache entries
When cache_entry structs are removed from index_state.cache, they are not
properly freed. Freeing those entries wasn't possible before because we
couldn't remove them from index_state.name_hash.
Now that we _do_ remove the entries from name_hash, we can also free them.
Add 'free(cache_entry)' to all call sites of name-hash.c::remove_name_hash
in read-cache.c (we could free() directly in remove_name_hash(), but
name-hash.c isn't concerned with cache_entry allocation at all).
Accessing a cache_entry after removing it from the index is now no longer
allowed, as the memory has been freed. The following functions need minor
fixes (typically by copying ce->name before use):
- builtin/rm.c::cmd_rm
- builtin/update-index.c::do_reupdate
- read-cache.c::read_index_unmerged
- resolve-undo.c::unmerge_index_entry_at
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 3a0e0eaab..171f37c1c 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -311,7 +311,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) if (!match_pathspec_depth(&pathspec, ce->name, ce_namelen(ce), 0, seen)) continue; ALLOC_GROW(list.entry, list.nr + 1, list.alloc); - list.entry[list.nr].name = ce->name; + list.entry[list.nr].name = xstrdup(ce->name); list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode); if (list.entry[list.nr++].is_submodule && !is_staging_gitmodules_ok()) |