patch 8.2.4974: ":so" command may read after end of buffer
Problem: ":so" command may read after end of buffer.
Solution: Compute length of text properly.
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 03c733d..f3a5783 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1965,6 +1965,7 @@
break;
buf = (char_u *)ga.ga_data;
buf[ga.ga_len++] = NUL;
+ len = ga.ga_len;
}
else
{
@@ -1972,8 +1973,8 @@
if (fgets((char *)buf + ga.ga_len, ga.ga_maxlen - ga.ga_len,
sp->fp) == NULL)
break;
+ len = ga.ga_len + (int)STRLEN(buf + ga.ga_len);
}
- len = ga.ga_len + (int)STRLEN(buf + ga.ga_len);
#ifdef USE_CRNL
// Ignore a trailing CTRL-Z, when in Dos mode. Only recognize the
// CTRL-Z by its own, or after a NL.
diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim
index 5f45ab4..4736e93 100644
--- a/src/testdir/test_source.vim
+++ b/src/testdir/test_source.vim
@@ -652,6 +652,17 @@
norm300gr0
so
bwipe!
+
+ let lines =<< trim END
+ new
+ norm 10a0000000000ø00000000000
+ norm i0000000000000000000
+ silent! so
+ END
+ call writefile(lines, 'Xtest.vim')
+ source Xtest.vim
+ bwipe!
+ call delete('Xtest.vim')
endfunc
diff --git a/src/version.c b/src/version.c
index 68d11a2..98bb40d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4974,
+/**/
4973,
/**/
4972,