thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2472: crash when using command line window in an autocommand

Browse Source 
Problem:    Crash when using command line window in an autocommand.
            (houyunsong)
Solution:   Save and restore au_new_curbuf.
This commit is contained in:
Bram Moolenaar
2021-02-06 17:30:31 +01:00
parent efa1923565
commit aad5f9d79a
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ex_cmds.c
View File

@@ -2710,8 +2710,9 @@ do_ecmd(
*/
if (buf != curbuf)
{
bufref_T save_au_new_curbuf;
#ifdef FEAT_CMDWIN
int save_cmdwin_type = cmdwin_type;
int save_cmdwin_type = cmdwin_type;
// BufLeave applies to the old buffer.
cmdwin_type = 0;
@@ -2728,6 +2729,7 @@ do_ecmd(
*/
if (buf->b_fname != NULL)
new_name = vim_strsave(buf->b_fname);
save_au_new_curbuf = au_new_curbuf;
set_bufref(&au_new_curbuf, buf);
apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
#ifdef FEAT_CMDWIN
@@ -2737,12 +2739,14 @@ do_ecmd(
{
// new buffer has been deleted
delbuf_msg(new_name); // frees new_name
au_new_curbuf = save_au_new_curbuf;
goto theend;
}
#ifdef FEAT_EVAL
if (aborting()) // autocmds may abort script processing
{
vim_free(new_name);
au_new_curbuf = save_au_new_curbuf;
goto theend;
}
#endif
@@ -2778,6 +2782,7 @@ do_ecmd(
if (aborting() && curwin->w_buffer != NULL)
{
vim_free(new_name);
au_new_curbuf = save_au_new_curbuf;
goto theend;
}
#endif
@@ -2786,6 +2791,7 @@ do_ecmd(
{
// new buffer has been deleted
delbuf_msg(new_name); // frees new_name
au_new_curbuf = save_au_new_curbuf;
goto theend;
}
if (buf == curbuf) // already in new buffer
@@ -2831,8 +2837,7 @@ do_ecmd(
#endif
}
vim_free(new_name);
au_new_curbuf.br_buf = NULL;
au_new_curbuf.br_buf_free_count = 0;
au_new_curbuf = save_au_new_curbuf;
}
curwin->w_pcmark.lnum = 1;