mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-13 13:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0313: Crash when using heredoc with comment in command block

Browse Source 
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

1f5175d9af
This commit is contained in:
zeertzjq
2024-04-14 05:03:49 +08:00
parent 617a385142
commit e81fe387d6
3 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/eval/vars.c
View File

@@ -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;
}