H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-08 00:24:03 +00:00
Code Releases Activity

rerere: do not leak mmfile[] for a path with multiple stage entries

Browse Source 
A conflicted index can have multiple stage  entries when dealing
with a criss-cross merge and using the "resolve" merge strategy.

Plug the leak by reading only the first one of the same stage
entries.

Strictly speaking, this fix does change the semantics, in that we
used to use the last stage  entry as the common ancestor when
doing the plain-vanilla three-way merge, but with the leak fix, we
will use the first stage  entry.  But it is not a grave backward
compatibility breakage.  Either way, we are arbitrarily picking one
of multiple stage  entries and using it, ignoring others, and
there is no meaning in the ordering of these stage  entries.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-07-24 15:10:52 -07:00
parent 74444d4ec4
commit 7d4053b69b
1 changed files with 4 additions and 2 deletions

6
rerere.c

@ -337,8 +337,10 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
break;
i = ce_stage(ce) - 1;
mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
mmfile[i].size = size;
if (!mmfile[i].ptr) {
mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
mmfile[i].size = size;
}
}
for (i = 0; i < 3; i++)
if (!mmfile[i].ptr && !mmfile[i].size)