Skip to content

Commit

Permalink
Initialize rev before using &rev.pending
Browse files Browse the repository at this point in the history
If reset_tree returns a non-zero value, stash_working_tree calls
object_array_clear with &rev.pending before rev is initialized.  This
causes a segmentation fault.  Prevent this by initializing rev before
calling reset_tree.

This fixes git-for-windows#2006.

Signed-off-by: Matthew Kraai <mkraai@its.jnj.com>
  • Loading branch information
kraai committed Jan 4, 2019
1 parent 7b95654 commit 8149e4f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
3 changes: 2 additions & 1 deletion builtin/stash.c
Original file line number Diff line number Diff line change
Expand Up @@ -1048,14 +1048,15 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
struct strbuf diff_output = STRBUF_INIT;
struct index_state istate = { NULL };

init_revisions(&rev, NULL);

set_alternate_index_output(stash_index_path.buf);
if (reset_tree(&info->i_tree, 0, 0)) {
ret = -1;
goto done;
}
set_alternate_index_output(NULL);

init_revisions(&rev, NULL);
rev.prune_data = ps;
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = add_diff_to_buf;
Expand Down
8 changes: 8 additions & 0 deletions t/t3903-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,14 @@ test_expect_success 'stash an added file' '
test new = "$(cat file3)"
'

test_expect_success 'stash --intent-to-add file' '
git reset --hard &&
echo new >file4 &&
git add --intent-to-add file4 &&
test_when_finished "git rm -f file4" &&
test_must_fail git stash
'

test_expect_success 'stash rm then recreate' '
git reset --hard &&
git rm file &&
Expand Down

0 comments on commit 8149e4f

Please sign in to comment.