kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2017-07-31 13:05:15 -07:00
parent 5800c63717 9e7d8a9bfb
commit 483709ab4d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blame.c
View File

@ -1663,7 +1663,7 @@ static struct commit *find_single_final(struct rev_info *revs,
name = revs->pending.objects[i].name; name = revs->pending.objects[i].name;
} }
if (name_p) if (name_p)
*name_p = name; *name_p = xstrdup_or_null(name);
return found; return found;
} }


@ -1735,7 +1735,7 @@ static struct commit *find_single_initial(struct rev_info *revs,
die("No commit to dig up from?"); die("No commit to dig up from?");


if (name_p) if (name_p)
*name_p = name; *name_p = xstrdup(name);
return found; return found;
} }


@ -1843,6 +1843,8 @@ void setup_scoreboard(struct blame_scoreboard *sb, const char *path, struct blam


if (orig) if (orig)
*orig = o; *orig = o;

free((char *)final_commit_name);
} }