thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0357: crash when setting 'guicursor' to weird value

Browse Source 
Problem:    Crash when setting 'guicursor' to weird value.
Solution:   Avoid negative size. (Dominique Pelle, closes #1465)
This commit is contained in:
Bram Moolenaar
2017-02-23 17:59:22 +01:00
parent 354796c19a
commit 24922ec233
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/misc2.c
View File

@@ -3472,11 +3472,12 @@ parse_shape_opt(int what)
while (*modep != NUL) while (*modep != NUL)
{ {
colonp = vim_strchr(modep, ':'); 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"); return (char_u *)N_("E545: Missing colon");
if (colonp == modep) if (colonp == modep)
return (char_u *)N_("E546: Illegal mode"); return (char_u *)N_("E546: Illegal mode");
commap = vim_strchr(modep, ',');
/* /*
* Repeat for all mode's before the colon. * Repeat for all mode's before the colon.

9
src/testdir/test_options.vim
View File

@@ -235,7 +235,14 @@ func Test_set_errors()
call assert_fails('set statusline=%{', 'E540:') call assert_fails('set statusline=%{', 'E540:')
call assert_fails('set statusline=' . repeat("%p", 81), 'E541:') call assert_fails('set statusline=' . repeat("%p", 81), 'E541:')
call assert_fails('set statusline=%(', 'E542:') 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 backupext=~ patchmode=~', 'E589:')
call assert_fails('set winminheight=10 winheight=9', 'E591:') call assert_fails('set winminheight=10 winheight=9', 'E591:')
call assert_fails('set winminwidth=10 winwidth=9', 'E592:') call assert_fails('set winminwidth=10 winwidth=9', 'E592:')

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
357,
/**/ /**/
356, 356,
/**/ /**/