aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.0.1403: using freed buffer in grep command

Browse Source 
Problem:    Using freed buffer in grep command. (gy741, Dominique Pelle)
Solution:   Lock the dummy buffer to avoid autocommands wiping it out.
This commit is contained in:
Bram Moolenaar 2017-12-18 15:33:00 +01:00
parent 9bca805ec4
commit 4fb921e388
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/quickfix.c
View File

@ -4572,6 +4572,7 @@ load_dummy_buffer(
bufref_T newbuf_to_wipe; bufref_T newbuf_to_wipe;
int failed = TRUE; int failed = TRUE;
aco_save_T aco; aco_save_T aco;
int readfile_result;
/* Allocate a buffer without putting it in the buffer list. */ /* Allocate a buffer without putting it in the buffer list. */
newbuf = buflist_new(NULL, NULL, (linenr_T)1, BLN_DUMMY); newbuf = buflist_new(NULL, NULL, (linenr_T)1, BLN_DUMMY);
@ -4585,6 +4586,9 @@ load_dummy_buffer(
/* need to open the memfile before putting the buffer in a window */ /* need to open the memfile before putting the buffer in a window */
if (ml_open(newbuf) == OK) if (ml_open(newbuf) == OK)
{ {
/* Make sure this buffer isn't wiped out by auto commands. */
++newbuf->b_locked;
/* set curwin/curbuf to buf and save a few things */ /* set curwin/curbuf to buf and save a few things */
aucmd_prepbuf(&aco, newbuf); aucmd_prepbuf(&aco, newbuf);
@ -4599,9 +4603,11 @@ load_dummy_buffer(
curbuf->b_flags &= ~BF_DUMMY; curbuf->b_flags &= ~BF_DUMMY;
newbuf_to_wipe.br_buf = NULL; newbuf_to_wipe.br_buf = NULL;
if (readfile(fname, NULL, readfile_result = readfile(fname, NULL,
(linenr_T)0, (linenr_T)0, (linenr_T)MAXLNUM, (linenr_T)0, (linenr_T)0, (linenr_T)MAXLNUM,
NULL, READ_NEW | READ_DUMMY) == OK NULL, READ_NEW | READ_DUMMY);
--newbuf->b_locked;
if (readfile_result == OK
&& !got_int && !got_int
&& !(curbuf->b_flags & BF_NEW)) && !(curbuf->b_flags & BF_NEW))
{ {

7
src/testdir/test_autocmd.vim
View File

@ -1171,3 +1171,10 @@ func Test_nocatch_wipe_all_buffers()
bwipe bwipe
au! au!
endfunc endfunc
func Test_nocatch_wipe_dummy_buffer()
" Nasty autocommand: wipe buffer on any event.
au * x bwipe
call assert_fails('lv½ /x', 'E480')
au!
endfunc

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1403,
/**/ /**/
1402, 1402,
/**/ /**/