diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-23 17:59:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-23 17:59:22 +0100 |
| commit | 24922ec23360e7ea7c5a803c9edf476bb6395b32 (patch) | |
| tree | c23edca1b1a49453b68a57e4e4ae6c7e1d217b94 | |
| parent | 354796c19a0a4a048017059a0281938cc0b8f09a (diff) | |
| download | vim-git-24922ec23360e7ea7c5a803c9edf476bb6395b32.tar.gz | |
patch 8.0.0357: crash when setting 'guicursor' to weird valuev8.0.0357
Problem: Crash when setting 'guicursor' to weird value.
Solution: Avoid negative size. (Dominique Pelle, closes #1465)
| -rw-r--r-- | src/misc2.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_options.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/misc2.c b/src/misc2.c index 71ca6d8f5..992e5c292 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -3472,11 +3472,12 @@ parse_shape_opt(int what) while (*modep != NUL) { colonp = vim_strchr(modep, ':'); - if (colonp == NULL) + commap = vim_strchr(modep, ','); + + if (colonp == NULL || (commap != NULL && commap < colonp)) return (char_u *)N_("E545: Missing colon"); if (colonp == modep) return (char_u *)N_("E546: Illegal mode"); - commap = vim_strchr(modep, ','); /* * Repeat for all mode's before the colon. diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index 11466dc16..1ee1f8fa8 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -235,7 +235,14 @@ func Test_set_errors() call assert_fails('set statusline=%{', 'E540:') call assert_fails('set statusline=' . repeat("%p", 81), 'E541:') call assert_fails('set statusline=%(', 'E542:') - call assert_fails('set guicursor=x', 'E545:') + if has('cursorshape') + " This invalid value for 'guicursor' used to cause Vim to crash. + call assert_fails('set guicursor=i-ci,r-cr:h', 'E545:') + call assert_fails('set guicursor=i-ci', 'E545:') + call assert_fails('set guicursor=x', 'E545:') + call assert_fails('set guicursor=r-cr:horx', 'E548:') + call assert_fails('set guicursor=r-cr:hor0', 'E549:') + endif call assert_fails('set backupext=~ patchmode=~', 'E589:') call assert_fails('set winminheight=10 winheight=9', 'E591:') call assert_fails('set winminwidth=10 winwidth=9', 'E592:') diff --git a/src/version.c b/src/version.c index 94a325beb..2d076cc14 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 357, +/**/ 356, /**/ 355, |