Mercurial > vim
changeset 26454:9998318235cd v8.2.3757
patch 8.2.3757: an overlong highlight group name is silently truncated
Commit: https://github.com/vim/vim/commit/f7f7aaf8aaad34a38d3f159e031c5bcf3394f8f1
Author: erw7 <erw7.github@gmail.com>
Date: Tue Dec 7 21:29:20 2021 +0000
patch 8.2.3757: an overlong highlight group name is silently truncated
Problem: An overlong highlight group name is silently truncated.
Solution: Give an error if the name is too long. (closes https://github.com/vim/vim/issues/9289)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 07 Dec 2021 22:30:03 +0100 |
| parents | 71ff3e252eb6 |
| children | 1edd58619d1b |
| files | src/errors.h src/highlight.c src/testdir/test_highlight.vim src/version.c |
| diffstat | 4 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"));
--- 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;
--- 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