Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixed crash with invalid value of 'guicursor' #1465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixed crash with invalid value of 'guicursor' #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/misc2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 8 additions & 1 deletion src/testdir/test_options.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,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:')
Expand Down