global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-19 05:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

log -L: do not free parents lists we might need again

Browse Source 
The parent rewriting code of 'git log -L' was too aggressive in
freeing memory: assign_range_to_parent() will free the commit->parents
field when it sees that a parent cannot pass off any blame (is a root
commit in rewritten history).

Its caller assign_parents_range() however will, upon finding the first
parent that takes *full* blame for all ranges, rewind and reinstate
all previous parents' line ranges and parent lists.  This resurrects
pointers to ranges that were freed in assign_range_to_parent() under
some circumstances.

Furthermore, we must not empty the parent lists either: the same
rewind/reinstate code relies on them.

Do both only if the commit was an ordinary (not merge or root) commit,
in which case the merge code-path discussed here is never taken.

Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Rast
2010-09-11 23:10:57 +02:00
committed by Junio C Hamano
parent 6eed493d2d
commit 09457d2867
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
line.c
View File

@@ -961,8 +961,10 @@ static int assign_range_to_parent(struct rev_info *rev, struct commit *c,
* If there is no new ranges assigned to the parent,
* we should mark it as a 'root' commit.
*/
free(c->parents);
c->parents = NULL;
if (c->parents && !c->parents->next) {
free(c->parents);
c->parents = NULL;
}
}
/* and the ranges of current commit c is updated */