rerere: do not leak mmfile[] for a path with multiple stage #1 entries
A conflicted index can have multiple stage #1 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 #1 entry as the common ancestor when doing the plain-vanilla three-way merge, but with the leak fix, we will use the first stage #1 entry. But it is not a grave backward compatibility breakage. Either way, we are arbitrarily picking one of multiple stage #1 entries and using it, ignoring others, and there is no meaning in the ordering of these stage #1 entries. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 24, 2015 at 15:10 UTC
7d4053b69b37927c0ccd98eac41f32707227eca0
1 file changed
+4
-2
rerere.c
+4
-2
@@ -337,8 +337,10 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
337
if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
338
break;
339
i = ce_stage(ce) - 1;
340
- mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
341
- mmfile[i].size = size;
340
+ if (!mmfile[i].ptr) {
341
+ mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
342
+ mmfile[i].size = size;
343
+ }
344
}
345
for (i = 0; i < 3; i++)
346
if (!mmfile[i].ptr && !mmfile[i].size)