blame: fix memory corruption scrambling revision name in error message

szeder · gitster · commit 9e7d8a9bfb32 · 2017-07-24T14:38:02.000-07:00
When attempting to blame a non-existing path, git should show an error message like this: $ git blame e83c516 -- nonexisting-file fatal: no such path nonexisting-file in e83c516 Since the recent commit 835c49f (blame: rework methods that determine 'final' commit, 2017-05-24) the revision name is either missing or some scrambled characters are shown instead. The reason is that the revision name must be duplicated, because it is invalidated when the pending objects array is cleared in the meantime, but this commit dropped the duplication. Restore the duplication of the revision name in the affected functions (find_single_final() and find_single_initial()). Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/blame.c b/blame.c
@@ -1664,7 +1664,7 @@ static struct commit *find_single_final(struct rev_info *revs,
 		name = revs->pending.objects[i].name;
 	}
 	if (name_p)
-		*name_p = name;
+		*name_p = xstrdup_or_null(name);
 	return found;
 }
 
@@ -1736,7 +1736,7 @@ static struct commit *find_single_initial(struct rev_info *revs,
 		die("No commit to dig up from?");
 
 	if (name_p)
-		*name_p = name;
+		*name_p = xstrdup(name);
 	return found;
 }
 
@@ -1844,6 +1844,8 @@ void setup_scoreboard(struct blame_scoreboard *sb, const char *path, struct blam
 
 	if (orig)
 		*orig = o;
+
+	free((char *)final_commit_name);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1664,7 +1664,7 @@ static struct commit find_single_final(struct rev_info revs,`
`1664`	`1664`	`name = revs->pending.objects[i].name;`
`1665`	`1665`	`}`
`1666`	`1666`	`if (name_p)`
`1667`		`- *name_p = name;`
	`1667`	`+ *name_p = xstrdup_or_null(name);`
`1668`	`1668`	`return found;`
`1669`	`1669`	`}`
`1670`	`1670`
`@@ -1736,7 +1736,7 @@ static struct commit find_single_initial(struct rev_info revs,`
`1736`	`1736`	`die("No commit to dig up from?");`
`1737`	`1737`
`1738`	`1738`	`if (name_p)`
`1739`		`- *name_p = name;`
	`1739`	`+ *name_p = xstrdup(name);`
`1740`	`1740`	`return found;`
`1741`	`1741`	`}`
`1742`	`1742`
`@@ -1844,6 +1844,8 @@ void setup_scoreboard(struct blame_scoreboard sb, const char path, struct blam`
`1844`	`1844`
`1845`	`1845`	`if (orig)`
`1846`	`1846`	`*orig = o;`
	`1847`	`+`
	`1848`	`+ free((char *)final_commit_name);`
`1847`	`1849`	`}`
`1848`	`1850`
`1849`	`1851`