diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-22 14:08:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-22 14:08:49 +0200 |
| commit | 4841a7ccaed57f723016656e9683b587ac91f621 (patch) | |
| tree | 0793848663ec98b1a2b0a0a82231bcbacc2449ab | |
| parent | 9cea87c5775948a35098f3602746c20ecf95dbcd (diff) | |
| download | vim-git-4841a7ccaed57f723016656e9683b587ac91f621.tar.gz | |
patch 8.1.0426: accessing invalid memory in SmcOpenConnection()v8.1.0426
Problem: Accessing invalid memory in SmcOpenConnection().
Solution: Reduce size of errorstring by one. (Dominique Pelle, closes #3469)
| -rw-r--r-- | src/os_unix.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_startup.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
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 @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 426, +/**/ 425, /**/ 424, |