summaryrefslogtreecommitdiff
path: root/src/ex_getln.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-20 15:02:42 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-20 15:02:42 +0200
commit66250c932e8a0e3c43e7c7c7b1dbede040b9c508 (patch)
tree485324d99b96692841c3f44ad0f76b4c67be4d49 /src/ex_getln.c
parent93ad14710bdf77591f927a2b244bba6a8cbc7706 (diff)
downloadvim-git-66250c932e8a0e3c43e7c7c7b1dbede040b9c508.tar.gz
patch 8.2.1491: Vim9: crash when compiling heredoc lines start with commentv8.2.1491
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)
Diffstat (limited to 'src/ex_getln.c')
-rw-r--r--src/ex_getln.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 702b63db5..60a8a0c71 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2705,12 +2705,12 @@ getexline(
int c, // normally ':', NUL for ":append"
void *cookie UNUSED,
int indent, // indent for inside conditionals
- int do_concat)
+ getline_opt_T options)
{
// When executing a register, remove ':' that's in front of each line.
if (exec_from_reg && vpeekc() == ':')
(void)vgetc();
- return getcmdline(c, 1L, indent, do_concat);
+ return getcmdline(c, 1L, indent, options);
}
/*
@@ -2725,7 +2725,7 @@ getexmodeline(
// :s prompt
void *cookie UNUSED,
int indent, // indent for inside conditionals
- int do_concat UNUSED)
+ getline_opt_T options UNUSED)
{
garray_T line_ga;
char_u *pend;