Skip to content

Commit

Permalink
mailinfo: fix passing wrong address to git_mailinfo_config
Browse files Browse the repository at this point in the history
git_mailinfo_config() expects "struct mailinfo *". But in
setup_mailinfo(), "mi" is already "struct mailinfo *". &mi would make
it "struct mailinfo **" and git_mailinfo_config() would damage some
other memory when it assigns some value to mi->use_scissors.

This is caught by t4150.20. git_mailinfo_config() breaks
mi->name.alloc and makes strbuf_release() in clear_mailinfo() attempt
to free strbuf_slopbuf.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Nov 1, 2015
1 parent 6ac617a commit 85d9d9d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ void setup_mailinfo(struct mailinfo *mi)
mi->header_stage = 1;
mi->use_inbody_headers = 1;
mi->content_top = mi->content;
git_config(git_mailinfo_config, &mi);
git_config(git_mailinfo_config, mi);
}

void clear_mailinfo(struct mailinfo *mi)
Expand Down

0 comments on commit 85d9d9d

Please sign in to comment.