diff options
| author | erw7 <erw7.github@gmail.com> | 2021-12-07 21:29:20 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-07 21:29:20 +0000 |
| commit | f7f7aaf8aaad34a38d3f159e031c5bcf3394f8f1 (patch) | |
| tree | ae3bccdefbc7cf24680259b8e92981f5037d3993 | |
| parent | 4dc24eb5adbcc76838fae1e900936dd230209d96 (diff) | |
| download | vim-git-f7f7aaf8aaad34a38d3f159e031c5bcf3394f8f1.tar.gz | |
patch 8.2.3757: an overlong highlight group name is silently truncatedv8.2.3757
Problem: An overlong highlight group name is silently truncated.
Solution: Give an error if the name is too long. (closes #9289)
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/highlight.c | 11 | ||||
| -rw-r--r-- | src/testdir/test_highlight.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/src/errors.h b/src/errors.h index a494de372..452ff451b 100644 --- a/src/errors.h +++ b/src/errors.h @@ -756,3 +756,5 @@ EXTERN char e_line_number_out_of_range[] INIT(= N_("E1247: Line number out of range")); EXTERN char e_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")); diff --git a/src/highlight.c b/src/highlight.c index 2deda6829..9502428aa 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -18,6 +18,8 @@ #define SG_GUI 4 // gui 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 * following names, separated by commas (but no spaces!). @@ -3328,12 +3330,12 @@ set_hl_attr( syn_name2id(char_u *name) { 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 alloc()/free(), these are slow too. ID names over 200 chars // don't deserve to be found! - vim_strncpy(name_u, name, 199); + vim_strncpy(name_u, name, MAX_SYN_NAME); vim_strup(name_u); for (i = highlight_ga.ga_len; --i >= 0; ) if (HL_TABLE()[i].sg_name_u != NULL @@ -3411,6 +3413,11 @@ syn_check_group(char_u *pp, int len) int id; char_u *name; + if (len > MAX_SYN_NAME) + { + emsg(_(e_highlight_group_name_too_long)); + return 0; + } name = vim_strnsave(pp, len); if (name == NULL) return 0; diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim index 8e340bc1e..001cd39db 100644 --- a/src/testdir/test_highlight.vim +++ b/src/testdir/test_highlight.vim @@ -740,6 +740,7 @@ func Test_highlight_cmd_errors() call assert_fails('hi Xcomment ctermbg=fg', 'E419:') call assert_fails('hi Xcomment ctermfg=bg', 'E420:') call assert_fails('hi Xcomment ctermfg=ul', 'E453:') + call assert_fails('hi ' .. repeat('a', 201) .. ' ctermfg=black', 'E1249:') endif " Try using a very long terminal code. Define a dummy terminal code for this diff --git a/src/version.c b/src/version.c index c586acbd2..ccd3cf4bb 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3757, +/**/ 3756, /**/ 3755, |