IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0719: Resetting cell widths can make 'listchars' or 'fillchars' invalid (#30289)

Browse Source 
Problem:  Resetting cell widths can make 'listchars' or 'fillchars'
          invalid.
Solution: Check for conflicts when resetting cell widths (zeertzjq).

closes: vim/vim#15629

66f65a46c5
This commit is contained in:
zeertzjq 2024-09-07 07:36:51 +08:00 committed by GitHub
parent 439d031742
commit 738a84de09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/mbyte.c
View File

@ -2925,17 +2925,17 @@ void f_setcellwidths(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
emsg(_(e_listreq)); emsg(_(e_listreq));
return; return;
} }
const list_T *const l = argvars[0].vval.v_list; const list_T *const l = argvars[0].vval.v_list;
if (tv_list_len(l) == 0) { cw_interval_T *table = NULL;
const size_t table_size = (size_t)tv_list_len(l);
if (table_size == 0) {
// Clearing the table. // Clearing the table.
xfree(cw_table); goto update;
cw_table = NULL;
cw_table_size = 0;
goto done;
} }
// Note: use list_T instead of listitem_T so that TV_LIST_ITEM_NEXT can be used properly below. // Note: use list_T instead of listitem_T so that TV_LIST_ITEM_NEXT can be used properly below.
const list_T **ptrs = xmalloc(sizeof(const list_T *) * (size_t)tv_list_len(l)); const list_T **ptrs = xmalloc(sizeof(const list_T *) * table_size);
// Check that all entries are a list with three numbers, the range is // Check that all entries are a list with three numbers, the range is
// valid and the cell width is valid. // valid and the cell width is valid.
@ -2987,12 +2987,12 @@ void f_setcellwidths(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
}); });
// Sort the list on the first number. // Sort the list on the first number.
qsort((void *)ptrs, (size_t)tv_list_len(l), sizeof(const list_T *), tv_nr_compare); qsort((void *)ptrs, table_size, sizeof(const list_T *), tv_nr_compare);
cw_interval_T *table = xmalloc(sizeof(cw_interval_T) * (size_t)tv_list_len(l)); table = xmalloc(sizeof(cw_interval_T) * table_size);
// Store the items in the new table. // Store the items in the new table.
for (item = 0; item < tv_list_len(l); item++) { for (item = 0; (size_t)item < table_size; item++) {
const list_T *const li_l = ptrs[item]; const list_T *const li_l = ptrs[item];
const listitem_T *lili = tv_list_first(li_l); const listitem_T *lili = tv_list_first(li_l);
const varnumber_T n1 = TV_LIST_ITEM_TV(lili)->vval.v_number; const varnumber_T n1 = TV_LIST_ITEM_TV(lili)->vval.v_number;
@ -3011,10 +3011,12 @@ void f_setcellwidths(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
xfree((void *)ptrs); xfree((void *)ptrs);
update:
;
cw_interval_T *const cw_table_save = cw_table; cw_interval_T *const cw_table_save = cw_table;
const size_t cw_table_size_save = cw_table_size; const size_t cw_table_size_save = cw_table_size;
cw_table = table; cw_table = table;
cw_table_size = (size_t)tv_list_len(l); cw_table_size = table_size;
// Check that the new value does not conflict with 'listchars' or // Check that the new value does not conflict with 'listchars' or
// 'fillchars'. // 'fillchars'.
@ -3028,7 +3030,6 @@ void f_setcellwidths(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
} }
xfree(cw_table_save); xfree(cw_table_save);
done:
changed_window_setting_all(); changed_window_setting_all();
redraw_all_later(UPD_NOT_VALID); redraw_all_later(UPD_NOT_VALID);
} }

12
test/old/testdir/test_utf8.vim
View File

@ -255,15 +255,21 @@ func Test_setcellwidths()
call assert_fails('call setcellwidths([[0x33, 0x44, 2]])', 'E1114:') call assert_fails('call setcellwidths([[0x33, 0x44, 2]])', 'E1114:')
set listchars=tab:--\\u2192 set listchars=tab:--\\u2192 fillchars=stl:\\u2501
call assert_fails('call setcellwidths([[0x2192, 0x2192, 2]])', 'E834:') call assert_fails('call setcellwidths([[0x2192, 0x2192, 2]])', 'E834:')
set fillchars=stl:\\u2501
call assert_fails('call setcellwidths([[0x2501, 0x2501, 2]])', 'E835:') call assert_fails('call setcellwidths([[0x2501, 0x2501, 2]])', 'E835:')
call setcellwidths([[0x201c, 0x201d, 1]])
set listchars& fillchars& ambiwidth=double
set listchars=nbsp:\\u201c fillchars=vert:\\u201d
call assert_fails('call setcellwidths([])', 'E834:')
set listchars& set listchars&
call assert_fails('call setcellwidths([])', 'E835:')
set fillchars& set fillchars&
call setcellwidths([]) call setcellwidths([])
set ambiwidth&
bwipe! bwipe!
endfunc endfunc