diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-04-11 07:39:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-11 07:39:10 +0800 |
| commit | f504e799a3f62e485b09fe8ab9470a991f43e7f5 (patch) | |
| tree | f342b0eb64983ae20779b73ef18e9838ac5ba8b8 /src | |
| parent | 85099e989bbd8595afdb19937a8a00efdeb34a31 (diff) | |
| download | rneovim-f504e799a3f62e485b09fe8ab9470a991f43e7f5.tar.gz rneovim-f504e799a3f62e485b09fe8ab9470a991f43e7f5.tar.bz2 rneovim-f504e799a3f62e485b09fe8ab9470a991f43e7f5.zip | |
vim-patch:9.1.0301: Vim9: heredoc start may be recognized in string (#28266)
Problem: Vim9: heredoc start may be recognized in string.
Solution: Don't skip to closing bracket for invalid list assignment.
(zeertzjq)
closes: vim/vim#14472
https://github.com/vim/vim/commit/1817ccdb107ceeaf5c48fe193da5146682c15ca6
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/userfunc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index 72559fe9e0..d82d396d4d 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -2578,13 +2578,11 @@ void ex_function(exarg_T *eap) if (checkforcmd(&arg, "let", 2)) { int var_count = 0; int semicolon = 0; - const char *argend = skip_var_list(arg, &var_count, &semicolon, true); - if (argend == NULL) { - // Invalid list assignment: skip to closing bracket. - argend = find_name_end(arg, NULL, NULL, FNE_INCL_BR); + arg = (char *)skip_var_list(arg, &var_count, &semicolon, true); + if (arg != NULL) { + arg = skipwhite(arg); } - arg = skipwhite(argend); - if (arg[0] == '=' && arg[1] == '<' && arg[2] == '<') { + if (arg != NULL && strncmp(arg, "=<<", 3) == 0) { p = skipwhite(arg + 3); while (true) { if (strncmp(p, "trim", 4) == 0) { |