patch 8.2.4647: "source" can read past end of copied line
Problem: "source" can read past end of copied line.
Solution: Add a terminating NUL.
diff --git a/src/scriptfile.c b/src/scriptfile.c
index a334b2f..39936a4 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1918,7 +1918,10 @@
break; // all the lines are processed
ga_concat(&ga, ((char_u **)sp->buflines.ga_data)[sp->buf_lnum]);
sp->buf_lnum++;
+ if (ga_grow(&ga, 1) == FAIL)
+ break;
buf = (char_u *)ga.ga_data;
+ buf[ga.ga_len++] = NUL;
}
else
{
diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim
index 35d1453..5f45ab4 100644
--- a/src/testdir/test_source.vim
+++ b/src/testdir/test_source.vim
@@ -646,4 +646,13 @@
%bw!
endfunc
+func Test_source_buffer_long_line()
+ " This was reading past the end of the line.
+ new
+ norm300gr0
+ so
+ bwipe!
+endfunc
+
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 14fd1c3..b18de4c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4647,
+/**/
4646,
/**/
4645,