diff options
author | Clemens Buchacher <drizzd@aon.at> | 2013-05-28 00:49:57 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-28 11:26:24 -0700 |
commit | 46ec510ac088ac2669e617a4c8c35e6218dabecc (patch) | |
tree | 31bd560c6e1c11bd5d56c29067fa9640f4bb1c0d /ll-merge.c | |
parent | 04a74b6cfa5ef4870263f84ac94a488d9f2ef14a (diff) | |
download | git-46ec510ac088ac2669e617a4c8c35e6218dabecc.tar.gz |
fix segfault with git log -c --follow
In diff_tree_combined we make a copy of diffopts. In
try_to_follow_renames, called via diff_tree_sha1, we free and
re-initialize diffopts->pathspec->items. Since we did not make a deep
copy of diffopts in diff_tree_combined, the original diffopts does not
get the update. By the time we return from diff_tree_combined,
rev->diffopt->pathspec->items points to an invalid memory address. We
get a segfault next time we try to access that pathspec.
Instead, along with the copy of diffopts, make a copy pathspec->items as
well.
We would also have to make a copy of pathspec->raw to keep it consistent
with pathspec->items, but nobody seems to rely on that.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions