Mercurial > vim

comparison src/proto/window.pro @ 34379:37b4c89ba420 v9.1.0116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0116: win_split_ins may not check available room Commit: https://github.com/vim/vim/commit/0fd44a5ad81ade342cb54d8984965bdedd2272c8 Author: Sean Dewar <6256228+seandewar@users.noreply.github.com> Date: Tue Feb 20 20:28:15 2024 +0100 patch 9.1.0116: win_split_ins may not check available room Problem: win_split_ins has no check for E36 when moving an existing window Solution: check for room and fix the issues in f_win_splitmove() (Sean Dewar) win_split_ins has no check for E36 when moving an existing window, allowing for layouts with many overlapping zero-sized windows to be created (which may also cause drawing issues with tablines and such). f_win_splitmove also has some bugs. So check for room and fix the issues in f_win_splitmove. Handle failure in the two relevant win_split_ins callers by restoring the original layout, and factor the common logic into win_splitmove. Don't check for room when opening an autocommand window, as it's a temporary window that's rarely interacted with or drawn anyhow, and is rather important for some autocommands. Issues fixed in f_win_splitmove: - Error if splitting is disallowed. - Fix heap-use-after-frees if autocommands fired from switching to "targetwin" close "wp" or "oldwin". - Fix splitting the wrong window if autocommands fired from switching to "targetwin" switch to a different window. - Ensure -1 is returned for all errors. Also handle allocation failure a bit earlier in make_snapshot (callers, except win_splitmove, don't really care if a snapshot can't be made, so just ignore the return value). Note: Test_smoothscroll_in_zero_width_window failed after these changes with E36, as it was using the previous behaviour to create a zero-width window. I've fixed the test such that it fails with UBSAN as expected when v9.0.1367 is reverted (and simplified it too). related: #14042 Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Tue, 20 Feb 2024 22:30:04 +0100
parents 57b21d421cb2
children a84fe48ae523
comparison
equal deleted inserted replaced
34378:4d02bc6ddd97 34379:37b4c89ba420
2 int window_layout_locked(enum CMD_index cmd); 2 int window_layout_locked(enum CMD_index cmd);
3 win_T *prevwin_curwin(void); 3 win_T *prevwin_curwin(void);
4 win_T *swbuf_goto_win_with_buf(buf_T *buf); 4 win_T *swbuf_goto_win_with_buf(buf_T *buf);
5 void do_window(int nchar, long Prenum, int xchar); 5 void do_window(int nchar, long Prenum, int xchar);
6 void get_wincmd_addr_type(char_u *arg, exarg_T *eap); 6 void get_wincmd_addr_type(char_u *arg, exarg_T *eap);
7 int check_split_disallowed(win_T *wp);
7 int win_split(int size, int flags); 8 int win_split(int size, int flags);
9 int win_splitmove(win_T *wp, int size, int flags);
8 int win_split_ins(int size, int flags, win_T *new_wp, int dir); 10 int win_split_ins(int size, int flags, win_T *new_wp, int dir);
9 int win_valid_popup(win_T *win); 11 int win_valid_popup(win_T *win);
10 int win_valid(win_T *win); 12 int win_valid(win_T *win);
11 win_T *win_find_by_id(int id); 13 win_T *win_find_by_id(int id);
12 int win_valid_any_tab(win_T *win); 14 int win_valid_any_tab(win_T *win);
86 int min_rows(void); 88 int min_rows(void);
87 int only_one_window(void); 89 int only_one_window(void);
88 void check_lnums(int do_curwin); 90 void check_lnums(int do_curwin);
89 void check_lnums_nested(int do_curwin); 91 void check_lnums_nested(int do_curwin);
90 void reset_lnums(void); 92 void reset_lnums(void);
91 void make_snapshot(int idx); 93 int make_snapshot(int idx);
92 void restore_snapshot(int idx, int close_curwin); 94 void restore_snapshot(int idx, int close_curwin);
93 int win_hasvertsplit(void); 95 int win_hasvertsplit(void);
94 int get_win_number(win_T *wp, win_T *first_win); 96 int get_win_number(win_T *wp, win_T *first_win);
95 int get_tab_number(tabpage_T *tp); 97 int get_tab_number(tabpage_T *tp);
96 char *check_colorcolumn(win_T *wp); 98 char *check_colorcolumn(win_T *wp);