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

patch 8.2.3757: an overlong highlight group name is silently truncated

Browse Source 
Problem:    An overlong highlight group name is silently truncated.
Solution:   Give an error if the name is too long. (closes #9289)
This commit is contained in:
erw7 2021-12-07 21:29:20 +00:00 committed by Bram Moolenaar
parent 4dc24eb5ad
commit f7f7aaf8aa
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/errors.h
View File

@ -756,3 +756,5 @@ EXTERN char e_line_number_out_of_range[]
INIT(= N_("E1247: Line number out of range")); INIT(= N_("E1247: Line number out of range"));
EXTERN char e_closure_called_from_invalid_context[] EXTERN char e_closure_called_from_invalid_context[]
INIT(= N_("E1248: Closure called from invalid context")); INIT(= N_("E1248: Closure called from invalid context"));
EXTERN char e_highlight_group_name_too_long[]
INIT(= N_("E1249: Highlight group name too long"));

11
src/highlight.c
View File

@ -18,6 +18,8 @@
#define SG_GUI 4 // gui has been set #define SG_GUI 4 // gui has been set
#define SG_LINK 8 // link has been set #define SG_LINK 8 // link has been set
#define MAX_SYN_NAME 200
/* /*
* The "term", "cterm" and "gui" arguments can be any combination of the * The "term", "cterm" and "gui" arguments can be any combination of the
* following names, separated by commas (but no spaces!). * following names, separated by commas (but no spaces!).
@ -3328,12 +3330,12 @@ set_hl_attr(
syn_name2id(char_u *name) syn_name2id(char_u *name)
{ {
int i; int i;
char_u name_u[200]; char_u name_u[MAX_SYN_NAME + 1];
// Avoid using stricmp() too much, it's slow on some systems // Avoid using stricmp() too much, it's slow on some systems
// Avoid alloc()/free(), these are slow too. ID names over 200 chars // Avoid alloc()/free(), these are slow too. ID names over 200 chars
// don't deserve to be found! // don't deserve to be found!
vim_strncpy(name_u, name, 199); vim_strncpy(name_u, name, MAX_SYN_NAME);
vim_strup(name_u); vim_strup(name_u);
for (i = highlight_ga.ga_len; --i >= 0; ) for (i = highlight_ga.ga_len; --i >= 0; )
if (HL_TABLE()[i].sg_name_u != NULL if (HL_TABLE()[i].sg_name_u != NULL
@ -3411,6 +3413,11 @@ syn_check_group(char_u *pp, int len)
int id; int id;
char_u *name; char_u *name;
if (len > MAX_SYN_NAME)
{
emsg(_(e_highlight_group_name_too_long));
return 0;
}
name = vim_strnsave(pp, len); name = vim_strnsave(pp, len);
if (name == NULL) if (name == NULL)
return 0; return 0;

1
src/testdir/test_highlight.vim
View File

@ -740,6 +740,7 @@ func Test_highlight_cmd_errors()
call assert_fails('hi Xcomment ctermbg=fg', 'E419:') call assert_fails('hi Xcomment ctermbg=fg', 'E419:')
call assert_fails('hi Xcomment ctermfg=bg', 'E420:') call assert_fails('hi Xcomment ctermfg=bg', 'E420:')
call assert_fails('hi Xcomment ctermfg=ul', 'E453:') call assert_fails('hi Xcomment ctermfg=ul', 'E453:')
call assert_fails('hi ' .. repeat('a', 201) .. ' ctermfg=black', 'E1249:')
endif endif
" Try using a very long terminal code. Define a dummy terminal code for this " Try using a very long terminal code. Define a dummy terminal code for this

2
src/version.c
View File

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