fix(window): making float with title/footer non-float leaks memory (#30551)

3 files changed, 17 insertions, 15 deletions

diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c
index b006f86a76..f63fdc5381 100644
--- a/src/nvim/api/win_config.c
+++ b/src/nvim/api/win_config.c
@@ -448,7 +448,7 @@ void nvim_win_set_config(Window window, Dict(win_config) *config, Error *err)
         }
       }
     }
-    win->w_config = fconfig;
+    merge_win_config(&win->w_config, fconfig);
 
     // If there's no "vertical" or "split" set, or if "split" is unchanged,
     // then we can just change the size of the window.
@@ -1312,12 +1312,7 @@ static bool parse_win_config(win_T *wp, Dict(win_config) *config, WinConfig *fco
   return true;
 
 fail:
-  if (wp == NULL || fconfig->title_chunks.items != wp->w_config.title_chunks.items) {
-    clear_virttext(&fconfig->title_chunks);
-  }
-  if (wp == NULL || fconfig->footer_chunks.items != wp->w_config.footer_chunks.items) {
-    clear_virttext(&fconfig->footer_chunks);
-  }
+  merge_win_config(fconfig, wp != NULL ? wp->w_config : WIN_CONFIG_INIT);
   return false;
 #undef HAS_KEY_X
 }
diff --git a/src/nvim/window.c b/src/nvim/window.c
index f7d5ee92cd..d3280a3478 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -798,6 +798,19 @@ int win_fdccol_count(win_T *wp)
   return fdc[0] - '0';
 }
 
+/// Merges two window configs, freeing replaced fields if necessary.
+void merge_win_config(WinConfig *dst, const WinConfig src)
+  FUNC_ATTR_NONNULL_ALL
+{
+  if (dst->title_chunks.items != src.title_chunks.items) {
+    clear_virttext(&dst->title_chunks);
+  }
+  if (dst->footer_chunks.items != src.footer_chunks.items) {
+    clear_virttext(&dst->footer_chunks);
+  }
+  *dst = src;
+}
+
 void ui_ext_win_position(win_T *wp, bool validate)
 {
   wp->w_pos_changed = false;
@@ -1288,7 +1301,7 @@ win_T *win_split_ins(int size, int flags, win_T *new_wp, int dir, frame_T *to_fl
     new_frame(wp);
 
     // non-floating window doesn't store float config or have a border.
-    wp->w_config = WIN_CONFIG_INIT;
+    merge_win_config(&wp->w_config, WIN_CONFIG_INIT);
     CLEAR_FIELD(wp->w_border_adj);
   }
 
diff --git a/src/nvim/winfloat.c b/src/nvim/winfloat.c
index 0a90f638f3..f7e9128599 100644
--- a/src/nvim/winfloat.c
+++ b/src/nvim/winfloat.c
@@ -203,13 +203,7 @@ void win_config_float(win_T *wp, WinConfig fconfig)
                                   wp->w_config.border_hl_ids,
                                   sizeof fconfig.border_hl_ids) != 0);
 
-  if (fconfig.title_chunks.items != wp->w_config.title_chunks.items) {
-    clear_virttext(&wp->w_config.title_chunks);
-  }
-  if (fconfig.footer_chunks.items != wp->w_config.footer_chunks.items) {
-    clear_virttext(&wp->w_config.footer_chunks);
-  }
-  wp->w_config = fconfig;
+  merge_win_config(&wp->w_config, fconfig);
 
   bool has_border = wp->w_floating && wp->w_config.border;
   for (int i = 0; i < 4; i++) {