Permalink
Browse files

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 #1465)
  • Loading branch information...
brammool committed Feb 23, 2017
1 parent 354796c commit 24922ec23360e7ea7c5a803c9edf476bb6395b32
Showing with 13 additions and 3 deletions.
  1. +3 −2 src/misc2.c
  2. +8 −1 src/testdir/test_options.vim
  3. +2 −0 src/version.c
View
@@ -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.
@@ -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:')
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 357,
/**/
356,
/**/

0 comments on commit 24922ec

Please sign in to comment.