Merge branch 'js/blame-lib'

gitster · gitster · commit 483709ab4dce · 2017-07-31T13:05:15.000-07:00
A hotfix to a topic already in 'master'.

* js/blame-lib:
  blame: fix memory corruption scrambling revision name in error message
diff --git a/blame.c b/blame.c
@@ -1663,7 +1663,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;
 }
 
@@ -1735,7 +1735,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;
 }
 
@@ -1843,6 +1843,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
`@@ -1663,7 +1663,7 @@ static struct commit find_single_final(struct rev_info revs,`
`1663`	`1663`	`name = revs->pending.objects[i].name;`
`1664`	`1664`	`}`
`1665`	`1665`	`if (name_p)`
`1666`		`- *name_p = name;`
	`1666`	`+ *name_p = xstrdup_or_null(name);`
`1667`	`1667`	`return found;`
`1668`	`1668`	`}`
`1669`	`1669`
`@@ -1735,7 +1735,7 @@ static struct commit find_single_initial(struct rev_info revs,`
`1735`	`1735`	`die("No commit to dig up from?");`
`1736`	`1736`
`1737`	`1737`	`if (name_p)`
`1738`		`- *name_p = name;`
	`1738`	`+ *name_p = xstrdup(name);`
`1739`	`1739`	`return found;`
`1740`	`1740`	`}`
`1741`	`1741`
`@@ -1843,6 +1843,8 @@ void setup_scoreboard(struct blame_scoreboard sb, const char path, struct blam`
`1843`	`1843`
`1844`	`1844`	`if (orig)`
`1845`	`1845`	`*orig = o;`
	`1846`	`+`
	`1847`	`+ free((char *)final_commit_name);`
`1846`	`1848`	`}`
`1847`	`1849`
`1848`	`1850`