Mercurial > vim
changeset 10936:a516b6c279d9 v8.0.0357
patch 8.0.0357: crash when setting 'guicursor' to weird value
commit https://github.com/vim/vim/commit/24922ec23360e7ea7c5a803c9edf476bb6395b32
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Feb 23 17:59:22 2017 +0100
patch 8.0.0357: crash when setting 'guicursor' to weird value
Problem: Crash when setting 'guicursor' to weird value.
Solution: Avoid negative size. (Dominique Pelle, closes https://github.com/vim/vim/issues/1465)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 23 Feb 2017 18:00:05 +0100 |
| parents | 910486fdfd53 |
| children | ae3832cc9a28 |
| files | src/misc2.c src/testdir/test_options.vim src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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:')