summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2017-07-24 23:15:50 +0200
committerJunio C Hamano <gitster@pobox.com>2017-07-24 14:38:02 -0700
commit9e7d8a9bfb329c7f099abc1390a294482b5adbae (patch)
treeb490b405df11d787252cf5546ec50846e5c5b602
parentbd481de713cb59a57f5f988b9bc46550c954dc45 (diff)
downloadgit-js/blame-lib.tar.gz
blame: fix memory corruption scrambling revision name in error messagejs/blame-lib
When attempting to blame a non-existing path, git should show an error message like this: $ git blame e83c51633 -- nonexisting-file fatal: no such path nonexisting-file in e83c51633 Since the recent commit 835c49f7d (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>
-rw-r--r--blame.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/blame.c b/blame.c
index 00404b9738..07f9b75cce 100644
--- 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);
}