aboutsummaryrefslogtreecommitdiffstats
path: root/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-31 13:05:15 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-31 13:05:15 -0700
commit483709ab4dced5710c600a98b1222ca174d53daa (patch)
tree508f271b5219a20eb4a1930777f7f5e330a73092 /blame.c
parent5800c63717ae35286a1441f14ffff753e01f7e2b (diff)
parent9e7d8a9bfb329c7f099abc1390a294482b5adbae (diff)
downloadgit-483709ab4dced5710c600a98b1222ca174d53daa.tar.gz
Merge branch 'js/blame-lib'
A hotfix to a topic already in 'master'. * js/blame-lib: blame: fix memory corruption scrambling revision name in error message
Diffstat (limited to 'blame.c')
-rw-r--r--blame.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/blame.c b/blame.c
index 91e26e93e8..f575e9cbf4 100644
--- 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);
}