thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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: #14535

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-04-13 17:52:26 +02:00
committed by Christian Brabandt
parent e74cad3321
commit 1f5175d9af
6 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/evalvars.c
View File

@@ -781,8 +781,15 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get, int vim9compile)
int count = 0;
int heredoc_in_string = FALSE;
char_u *line_arg = NULL;
char_u *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;
@@ -826,14 +833,8 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get, int vim9compile)
if (*cmd != NUL && *cmd != comment_char)
{
marker = skipwhite(cmd);
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)
p = skiptowhite(marker);
if (*skipwhite(p) != NUL && *skipwhite(p) != comment_char)
{
semsg(_(e_trailing_characters_str), p);
return NULL;