Permalink
Browse files

patch 8.0.0743: the 'termsize' option can be set to an invalid value

Problem:    The 'termsize' option can be set to an invalid value.
Solution:   Check the 'termsize' option to be valid.
  • Loading branch information...
brammool committed Jul 22, 2017
1 parent 8f84c3a commit 825680f5f4ffed5d57fdb283dde5f0ad734605fc
Showing with 16 additions and 0 deletions.
  1. +13 −0 src/option.c
  2. +1 −0 src/testdir/gen_opt_test.vim
  3. +2 −0 src/version.c
View
@@ -7479,6 +7479,19 @@ did_set_string_option(
}
#endif
#ifdef FEAT_TERMINAL
/* 'termsize' */
else if (varp == &curwin->w_p_tms)
{
if (*curwin->w_p_tms != NUL)
{
p = skipdigits(curwin->w_p_tms);
if (p == curwin->w_p_tms || *p != 'x' || *skipdigits(p + 1) != NUL)
errmsg = e_invarg;
}
}
#endif
/* Options that are a list of flags. */
else
{
@@ -124,6 +124,7 @@ let test_values = {
\ 'switchbuf': [['', 'useopen', 'split,newtab'], ['xxx']],
\ 'tagcase': [['smart', 'match'], ['', 'xxx', 'smart,match']],
\ 'term': [[], []],
\ 'termsize': [['', '24x80', '0x80', '32x0', '0x0'], ['xxx', '80', '8ax9', '24x80b']],
\ 'toolbar': [['', 'icons', 'text'], ['xxx']],
\ 'toolbariconsize': [['', 'tiny', 'huge'], ['xxx']],
\ 'ttymouse': [['', 'xterm'], ['xxx']],
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
743,
/**/
742,
/**/

0 comments on commit 825680f

Please sign in to comment.