mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4752: wrong 'statusline' value can cause illegal memory access (#18117)

Browse Source 
Problem:    Wrong 'statusline' value can cause illegal memory access.
Solution:   Properly check the value. (closes vim/vim#10192)
5dc294a7b6

Make two error messages static variables.
This commit is contained in:
zeertzjq
2022-04-15 21:21:51 +08:00
committed by GitHub
parent a8d5a9e819
commit 08a144912c
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/option.c
View File

@@ -335,6 +335,9 @@ static char_u SHM_ALL[] = {
0, 0,
}; };
static char e_unclosed_expression_sequence[] = N_("E540: Unclosed expression sequence");
static char e_unbalanced_groups[] = N_("E542: unbalanced groups");
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "option.c.generated.h" # include "option.c.generated.h"
#endif #endif
@@ -2918,8 +2921,8 @@ ambw_end:
curbuf->b_help = (curbuf->b_p_bt[0] == 'h'); curbuf->b_help = (curbuf->b_p_bt[0] == 'h');
redraw_titles(); redraw_titles();
} }
} else if (gvarp == &p_stl || varp == &p_ruf) { } else if (gvarp == &p_stl || varp == &p_tal || varp == &p_ruf) {
// 'statusline' or 'rulerformat' // 'statusline', 'tabline' or 'rulerformat'
int wid; int wid;
if (varp == &p_ruf) { // reset ru_wid first if (varp == &p_ruf) { // reset ru_wid first
@@ -2938,7 +2941,7 @@ ambw_end:
errmsg = check_stl_option(p_ruf); errmsg = check_stl_option(p_ruf);
} }
} else if (varp == &p_ruf || s[0] != '%' || s[1] != '!') { } else if (varp == &p_ruf || s[0] != '%' || s[1] != '!') {
// check 'statusline' only if it doesn't start with "%!" // check 'statusline' or 'tabline' only if it doesn't start with "%!"
errmsg = check_stl_option(s); errmsg = check_stl_option(s);
} }
if (varp == &p_ruf && errmsg == NULL) { if (varp == &p_ruf && errmsg == NULL) {
@@ -3724,7 +3727,7 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set)
} }
/// Check validity of options with the 'statusline' format. /// Check validity of options with the 'statusline' format.
/// Return error message or NULL. /// Return an untranslated error message or NULL.
char *check_stl_option(char_u *s) char *check_stl_option(char_u *s)
{ {
int groupdepth = 0; int groupdepth = 0;
@@ -3773,18 +3776,22 @@ char *check_stl_option(char_u *s)
return illegal_char(errbuf, sizeof(errbuf), *s); return illegal_char(errbuf, sizeof(errbuf), *s);
} }
if (*s == '{') { if (*s == '{') {
int reevaluate = (*s == '%'); bool reevaluate = (*++s == '%');
s++;
if (reevaluate && *++s == '}') {
// "}" is not allowed immediately after "%{%"
return illegal_char(errbuf, sizeof(errbuf), '}');
}
while ((*s != '}' || (reevaluate && s[-1] != '%')) && *s) { while ((*s != '}' || (reevaluate && s[-1] != '%')) && *s) {
s++; s++;
} }
if (*s != '}') { if (*s != '}') {
return N_("E540: Unclosed expression sequence"); return e_unclosed_expression_sequence;
} }
} }
} }
if (groupdepth != 0) { if (groupdepth != 0) {
return N_("E542: unbalanced groups"); return e_unbalanced_groups;
} }
return NULL; return NULL;
} }

8
src/nvim/testdir/test_options.vim
View File

@@ -281,8 +281,16 @@ func Test_set_errors()
call assert_fails('set rulerformat=%15(%%', 'E542:') call assert_fails('set rulerformat=%15(%%', 'E542:')
call assert_fails('set statusline=%$', 'E539:') call assert_fails('set statusline=%$', 'E539:')
call assert_fails('set statusline=%{', 'E540:') call assert_fails('set statusline=%{', 'E540:')
call assert_fails('set statusline=%{%', 'E540:')
call assert_fails('set statusline=%{%}', 'E539:')
call assert_fails('set statusline=%(', 'E542:') call assert_fails('set statusline=%(', 'E542:')
call assert_fails('set statusline=%)', 'E542:') call assert_fails('set statusline=%)', 'E542:')
call assert_fails('set tabline=%$', 'E539:')
call assert_fails('set tabline=%{', 'E540:')
call assert_fails('set tabline=%{%', 'E540:')
call assert_fails('set tabline=%{%}', 'E539:')
call assert_fails('set tabline=%(', 'E542:')
call assert_fails('set tabline=%)', 'E542:')
if has('cursorshape') if has('cursorshape')
" This invalid value for 'guicursor' used to cause Vim to crash. " This invalid value for 'guicursor' used to cause Vim to crash.