diff options
| author | Cam Sinclair <csinkers@gmail.com> | 2022-02-25 17:42:23 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-02-25 17:42:23 +0000 |
| commit | 5c6edf41f9beffea21ce45d658822cc4c0745fdb (patch) | |
| tree | c5f2c4400cd8ee1a5aa792439c8680b6881beff1 | |
| parent | 5ec633b9b0400519db60253cb5846e50394218b4 (diff) | |
| download | vim-git-5c6edf41f9beffea21ce45d658822cc4c0745fdb.tar.gz | |
patch 8.2.4466: MS-Windows: illegal memory access in installerv8.2.4466
Problem: MS-Windows: illegal memory access in installer when using
"create-directories" as the final argument.
Solution: Check the argument count. (Cam Sinclair, closes #9844)
| -rw-r--r-- | src/dosinst.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/dosinst.c b/src/dosinst.c index 608f381f1..e77152fdd 100644 --- a/src/dosinst.c +++ b/src/dosinst.c @@ -2495,7 +2495,7 @@ command_line_setup_choices(int argc, char **argv) int vimfiles_dir_choice = (int)vimfiles_dir_none; init_directories_choice(); - if (argv[i + 1][0] != '-') + if (i + 1 < argc && argv[i + 1][0] != '-') { i++; if (strcmp(argv[i], "vim") == 0) diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 9614f55fe..56288d78f 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -863,6 +863,7 @@ func Test_d_file() bwipe! filetype off + call delete('Xfile.d') endfunc func Test_dep3patch_file() diff --git a/src/version.c b/src/version.c index 94479e3ce..d82fff51a 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,10 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4467, +/**/ + 4466, +/**/ 4465, /**/ 4464, |