aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

patch 9.0.2126: unused assignments when checking 'listchars'

Browse Source 
Problem:  Unused assignments when checking the value of 'listchars'.
Solution: Loop only once when just checking the value.  Add a test to
          check that this change doesn't cause double-free.

closes: #13559

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2023-11-23 20:47:16 +01:00 committed by Christian Brabandt
parent 40ed6711bd
commit 00624a2fa0
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/screen.c
View File

@ -4726,7 +4726,7 @@ set_chars_option(win_T *wp, char_u *value, int is_listchars, int apply)
}
// first round: check for valid value, second round: assign values
for (round = 0; round <= 1; ++round)
for (round = 0; round <= (apply ? 1 : 0); ++round)
{
if (round > 0)
{
@ -4913,11 +4913,6 @@ set_chars_option(win_T *wp, char_u *value, int is_listchars, int apply)
wp->w_fill_chars = fill_chars;
}
}
else if (is_listchars)
{
vim_free(lcs_chars.multispace);
vim_free(lcs_chars.leadmultispace);
}
return NULL; // no error
}

5
src/testdir/test_listchars.vim
View File

@ -265,6 +265,11 @@ func Test_listchars()
call Check_listchars(expected, 5, 12)
call assert_equal(expected, split(execute("%list"), "\n"))
" Changing the value of 'ambiwidth' twice shouldn't cause double-free when
" "leadmultispace" is specified.
set ambiwidth=double
set ambiwidth&
" Test leadmultispace and lead and space
normal ggdG
set listchars&

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2126,
/**/
2125,
/**/