patch 9.1.2090: Last buffer not freed with EXITFREE

Problem:  Last buffer not freed with EXITFREE (after 9.1.2087).
Solution: Free the last buffer when inside free_all_mem()
          (zeertzjq).

This isn't really a memory leak, as the last buffer's memory is still
reachable via pointers like firstbuf and lastbuf. But it's possible that
this may cause false ASAN warnings in the future, which is what EXITFREE
is supposed to prevent.

closes: #19194

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/buffer.c b/src/buffer.c
index bc57a4ea2e00809c555d437b4597f0461da9c8b9..62f236ff0b6b2f4a14fe7c8fa129512209a15772 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -777,17 +777,22 @@ aucmd_abort:
     // Autocommands may have opened or closed windows for this buffer.
     // Decrement the count for the close we do here.
     // Don't decrement b_nwindows if the buffer wasn't displayed in any window
-    // before calling buf_freeall(),
+    // before calling buf_freeall().
     if (nwindows > 0 && buf->b_nwindows > 0)
        --buf->b_nwindows;
 
     /*
      * Remove the buffer from the list.
      * Do not wipe out the buffer if it is used in a window, or if autocommands
-     * wiped out all other buffers.
+     * wiped out all other buffers (unless when inside free_all_mem() where all
+     * buffers need to be freed and autocommands are blocked).
      */
     if (wipe_buf && buf->b_nwindows <= 0
-                           && (buf->b_prev != NULL || buf->b_next != NULL))
+                           && (buf->b_prev != NULL || buf->b_next != NULL
+#if defined(EXITFREE)
+                               || entered_free_all_mem
+#endif
+                               ))
     {
        tabpage_T       *tp;
        win_T           *wp;

diff --git a/src/version.c b/src/version.c
index 157cab82cf74463163ebcf44919b33b8ac501c5b..ee2910062b8f883b76cc1842b2d26d5ba37cbbcf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2090,
 /**/
     2089,
 /**/