aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.1491: Vim9: crash when compiling heredoc lines start with comment

Browse Source 
Problem:    Vim9: crash when compiling heredoc lines start with comment.
Solution:   Skip over NULL pointers. Do not remove comment and empty lines
            when fetching function lines. (closes #6743)
This commit is contained in:
Bram Moolenaar
2020-08-20 15:02:42 +02:00
parent 93ad14710b
commit 66250c932e
16 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/userfunc.c
View File

@@ -2651,7 +2651,7 @@ def_function(exarg_T *eap, char_u *name_arg)
static int func_nr = 0; // number for nameless function
int paren;
hashitem_T *hi;
int do_concat = TRUE;
getline_opt_T getline_options = GETLINE_CONCAT_CONT;
linenr_T sourcing_lnum_off;
linenr_T sourcing_lnum_top;
int is_heredoc = FALSE;
@@ -3008,9 +3008,10 @@ def_function(exarg_T *eap, char_u *name_arg)
{
vim_free(line_to_free);
if (eap->getline == NULL)
theline = getcmdline(':', 0L, indent, do_concat);
theline = getcmdline(':', 0L, indent, getline_options);
else
theline = eap->getline(':', eap->cookie, indent, do_concat);
theline = eap->getline(':', eap->cookie, indent,
getline_options);
line_to_free = theline;
}
if (KeyTyped)
@@ -3053,7 +3054,7 @@ def_function(exarg_T *eap, char_u *name_arg)
{
VIM_CLEAR(skip_until);
VIM_CLEAR(heredoc_trimmed);
do_concat = TRUE;
getline_options = GETLINE_CONCAT_CONT;
is_heredoc = FALSE;
}
}
@@ -3178,7 +3179,7 @@ def_function(exarg_T *eap, char_u *name_arg)
skip_until = vim_strsave((char_u *)".");
else
skip_until = vim_strnsave(p, skiptowhite(p) - p);
do_concat = FALSE;
getline_options = GETLINE_NONE;
is_heredoc = TRUE;
}
@@ -3205,7 +3206,7 @@ def_function(exarg_T *eap, char_u *name_arg)
skipwhite(theline) - theline);
}
skip_until = vim_strnsave(p, skiptowhite(p) - p);
do_concat = FALSE;
getline_options = GETLINE_NONE;
is_heredoc = TRUE;
}
}
@@ -4249,7 +4250,7 @@ get_func_line(
int c UNUSED,
void *cookie,
int indent UNUSED,
int do_concat UNUSED)
getline_opt_T options UNUSED)
{
funccall_T *fcp = (funccall_T *)cookie;
ufunc_T *fp = fcp->func;