From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 22 Sep 2018 12:08:49 +0000 (+0200)
Subject: patch 8.1.0426: accessing invalid memory in SmcOpenConnection()
X-Git-Tag: v8.1.0426
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4841a7ccaed57f723016656e9683b587ac91f621;p=vim

patch 8.1.0426: accessing invalid memory in SmcOpenConnection()

Problem:    Accessing invalid memory in SmcOpenConnection().
Solution:   Reduce size of errorstring by one. (Dominique Pelle, closes #3469)
---

diff --git a/src/os_unix.c b/src/os_unix.c
index bd7b21996..0e2760988 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -8032,7 +8032,7 @@ xsmp_init(void)
 	    &smcallbacks,
 	    NULL,
 	    &xsmp.clientid,
-	    sizeof(errorstring),
+	    sizeof(errorstring) - 1,
 	    errorstring);
     if (xsmp.smcconn == NULL)
     {
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 4a296ec01..6f06ab877 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -272,7 +272,7 @@ endfunc
 " Test the -V[N]{filename} argument to set the 'verbose' option to N
 " and set 'verbosefile' to filename.
 func Test_V_file_arg()
-  if RunVim([], [], ' --clean -X -V2Xverbosefile -c "set verbose? verbosefile?" -cq')
+  if RunVim([], [], ' --clean -V2Xverbosefile -c "set verbose? verbosefile?" -cq')
     let out = join(readfile('Xverbosefile'), "\n")
     call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\n", out)
     call assert_match("\n  verbose=2\n", out)
diff --git a/src/version.c b/src/version.c
index 22cc075d0..480c1abf6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    426,
 /**/
     425,
 /**/