92 lines
2.6 KiB
Diff
92 lines
2.6 KiB
Diff
From 9b4a80a66544f2782040b641498754bcb5b8d461 Mon Sep 17 00:00:00 2001
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|
Date: Tue, 1 Feb 2022 13:54:17 +0000
|
|
Subject: [PATCH] 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.
|
|
---
|
|
src/buffer.c | 14 ++++++++++----
|
|
src/testdir/test_quickfix.vim | 16 ++++++++++++++++
|
|
2 files changed, 26 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/buffer.c b/src/buffer.c
|
|
index b4992dd..0f4957d 100644
|
|
--- a/src/buffer.c
|
|
+++ b/src/buffer.c
|
|
@@ -1666,6 +1666,7 @@ set_curbuf(buf_T *buf, int action)
|
|
#endif
|
|
bufref_T newbufref;
|
|
bufref_T prevbufref;
|
|
+ int valid;
|
|
|
|
setpcmark();
|
|
if (!cmdmod.keepalt)
|
|
@@ -1717,13 +1718,19 @@ set_curbuf(buf_T *buf, int action)
|
|
// An autocommand may have deleted "buf", already entered it (e.g., when
|
|
// it did ":bunload") or aborted the script processing.
|
|
// 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
|
|
&& !aborting()
|
|
#endif
|
|
) || 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
|
|
if (old_tw != curbuf->b_p_tw)
|
|
check_colorcolumn(curwin);
|
|
@@ -2236,8 +2243,7 @@ free_buf_options(
|
|
clear_string_option(&buf->b_p_vsts);
|
|
vim_free(buf->b_p_vsts_nopaste);
|
|
buf->b_p_vsts_nopaste = NULL;
|
|
- vim_free(buf->b_p_vsts_array);
|
|
- buf->b_p_vsts_array = NULL;
|
|
+ VIM_CLEAR(buf->b_p_vsts_array);
|
|
clear_string_option(&buf->b_p_vts);
|
|
VIM_CLEAR(buf->b_p_vts_array);
|
|
#endif
|
|
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
|
|
index f7c73f4..38a5236 100644
|
|
--- a/src/testdir/test_quickfix.vim
|
|
+++ b/src/testdir/test_quickfix.vim
|
|
@@ -876,6 +876,7 @@ func Test_locationlist_curwin_was_closed()
|
|
call assert_fails('lrewind', 'E924:')
|
|
|
|
augroup! testgroup
|
|
+ delfunc R
|
|
endfunc
|
|
|
|
func Test_locationlist_cross_tab_jump()
|
|
@@ -4674,4 +4675,19 @@ func Test_search_in_dirstack()
|
|
call delete('Xtestdir', 'rf')
|
|
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
|
|
--
|
|
2.27.0
|
|
|