0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.2.4281: using freed memory with :lopen and :bwipe

Problem:    Using freed memory with :lopen and :bwipe.
Solution:   Do not use a wiped out buffer.
This commit is contained in:
Bram Moolenaar
2022-02-01 13:54:17 +00:00
parent eb4a9ba293
commit 9b4a80a665
3 changed files with 29 additions and 4 deletions

View File

@@ -1706,6 +1706,7 @@ set_curbuf(buf_T *buf, int action)
#endif #endif
bufref_T newbufref; bufref_T newbufref;
bufref_T prevbufref; bufref_T prevbufref;
int valid;
setpcmark(); setpcmark();
if ((cmdmod.cmod_flags & CMOD_KEEPALT) == 0) if ((cmdmod.cmod_flags & CMOD_KEEPALT) == 0)
@@ -1763,13 +1764,19 @@ set_curbuf(buf_T *buf, int action)
// An autocommand may have deleted "buf", already entered it (e.g., when // An autocommand may have deleted "buf", already entered it (e.g., when
// it did ":bunload") or aborted the script processing. // it did ":bunload") or aborted the script processing.
// If curwin->w_buffer is null, enter_buffer() will make it valid again // If curwin->w_buffer is null, enter_buffer() will make it valid again
if ((buf_valid(buf) && buf != curbuf valid = buf_valid(buf);
if ((valid && buf != curbuf
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
&& !aborting() && !aborting()
#endif #endif
) || curwin->w_buffer == NULL) ) || curwin->w_buffer == NULL)
{ {
enter_buffer(buf); // If the buffer is not valid but curwin->w_buffer is NULL we must
// enter some buffer. Using the last one is hopefully OK.
if (!valid)
enter_buffer(lastbuf);
else
enter_buffer(buf);
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
if (old_tw != curbuf->b_p_tw) if (old_tw != curbuf->b_p_tw)
check_colorcolumn(curwin); check_colorcolumn(curwin);
@@ -2288,8 +2295,7 @@ free_buf_options(
clear_string_option(&buf->b_p_vsts); clear_string_option(&buf->b_p_vsts);
vim_free(buf->b_p_vsts_nopaste); vim_free(buf->b_p_vsts_nopaste);
buf->b_p_vsts_nopaste = NULL; buf->b_p_vsts_nopaste = NULL;
vim_free(buf->b_p_vsts_array); VIM_CLEAR(buf->b_p_vsts_array);
buf->b_p_vsts_array = NULL;
clear_string_option(&buf->b_p_vts); clear_string_option(&buf->b_p_vts);
VIM_CLEAR(buf->b_p_vts_array); VIM_CLEAR(buf->b_p_vts_array);
#endif #endif

View File

@@ -979,6 +979,7 @@ func Test_locationlist_curwin_was_closed()
call assert_fails('lrewind', 'E924:') call assert_fails('lrewind', 'E924:')
augroup! testgroup augroup! testgroup
delfunc R
endfunc endfunc
func Test_locationlist_cross_tab_jump() func Test_locationlist_cross_tab_jump()
@@ -5835,4 +5836,20 @@ func Test_two_qf_windows()
%bw! %bw!
endfunc endfunc
" Weird sequence of commands that caused entering a wiped-out buffer
func Test_lopen_bwipe()
func R()
silent! tab lopen
e x
silent! lfile
endfunc
cal R()
cal R()
cal R()
bw!
delfunc R
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -746,6 +746,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 */
/**/
4281,
/**/ /**/
4280, 4280,
/**/ /**/