patch 9.1.1971: Crash when buffer gets deleted inside charconvert during save

Problem:  Crash when buffer gets deleted inside charconvert during save
Solution: Check for `b_saving` inside `can_unload_buffer()`, so we don’t try to
          unload a buffer while it’s still being saved (glepnir).

closes: #18901

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/buffer.c b/src/buffer.c
index 90104cf0db785ca257b75344cfc04469b40380cb..0ed61a703265524327b2e1a5e3c27827c9766ab9 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -516,6 +516,10 @@ can_unload_buffer(buf_T *buf)
                break;
            }
     }
+    // Don't unload the buffer while it's still being saved
+    if (can_unload && buf->b_saving)
+       can_unload = FALSE;
+
     if (!can_unload)
     {
        char_u *fname = buf->b_fname != NULL ? buf->b_fname : buf->b_ffname;

diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim
index 1ffa7ae879afee18f1b79e652470852c4c8a8a7f..d688a8671e801d7312d26ec60910ed20dd0536ea 100644 (file)
--- a/src/testdir/test_buffer.vim
+++ b/src/testdir/test_buffer.vim
@@ -226,6 +226,13 @@ func Test_buffer_error()
   %bwipe
 endfunc
 
+func Test_bwipe_during_save()
+  set charconvert=execute('%bw!')
+  call assert_fails('write ++enc=lmao boom', 'E937:')
+
+  %bwipe
+endfunc
+
 " Test for the status messages displayed when unloading, deleting or wiping
 " out buffers
 func Test_buffer_statusmsg()

diff --git a/src/version.c b/src/version.c
index 2e806c33c16f9e4d5dbbb5627369b4228fef5bea..922242d91175df3c6066320bc9f175a7c65cbb8f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1971,
 /**/
     1970,
 /**/