From e81fe387d6291e5643a97a61e6d05b48aaeab2a1 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 14 Apr 2024 05:03:49 +0800 Subject: vim-patch:9.1.0313: Crash when using heredoc with comment in command block Problem: Crash when using heredoc with comment in command block. Solution: Handle a newline more like the end of the line, fix coverity warning (zeertzjq). closes: vim/vim#14535 https://github.com/vim/vim/commit/1f5175d9af3d3f37e19f23e0e6f84caec47390f2 --- src/nvim/eval/vars.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 70ecb76deb..37199cd95d 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -179,8 +179,15 @@ list_T *heredoc_get(exarg_T *eap, char *cmd, bool script_get) int text_indent_len = 0; char *text_indent = NULL; char dot[] = "."; + bool heredoc_in_string = false; + char *line_arg = NULL; + char *nl_ptr = vim_strchr(cmd, '\n'); - if (eap->ea_getline == NULL && vim_strchr(cmd, '\n') == NULL) { + if (nl_ptr != NULL) { + heredoc_in_string = true; + line_arg = nl_ptr + 1; + *nl_ptr = NUL; + } else if (eap->ea_getline == NULL) { emsg(_(e_cannot_use_heredoc_here)); return NULL; } @@ -217,17 +224,11 @@ list_T *heredoc_get(exarg_T *eap, char *cmd, bool script_get) } const char comment_char = '"'; - bool heredoc_in_string = false; - char *line_arg = NULL; // The marker is the next word. if (*cmd != NUL && *cmd != comment_char) { marker = skipwhite(cmd); - char *p = skiptowhite_or_nl(marker); - if (*p == NL) { - // heredoc in a string - line_arg = p + 1; - heredoc_in_string = true; - } else if (*skipwhite(p) != NUL && *skipwhite(p) != comment_char) { + char *p = skiptowhite(marker); + if (*skipwhite(p) != NUL && *skipwhite(p) != comment_char) { semsg(_(e_trailing_arg), p); return NULL; } -- cgit