aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0117: crash when using gettabwinvar() with invalid arguments

Browse Source 
Problem:    Crash when using gettabwinvar() with invalid arguments. (Yilin
            Yang)
Solution:   Use "curtab" if "tp" is NULL. (closes #5475)
This commit is contained in:
Bram Moolenaar 2020-01-14 19:05:39 +01:00
parent c10b521628
commit ee93b737aa
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/evalwindow.c
View File

@ -183,7 +183,8 @@ find_win_by_nr(
{
#ifdef FEAT_PROP_POPUP
// check tab-local popup windows
for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next)
for (wp = (tp == NULL ? curtab : tp)->tp_first_popupwin;
wp != NULL; wp = wp->w_next)
if (wp->w_id == nr)
return wp;
// check global popup windows

1
src/testdir/test_getvar.vim
View File

@ -83,6 +83,7 @@ func Test_var()
unlet def_dict
call assert_equal("", gettabwinvar(9, 2020, ''))
call assert_equal('', gettabwinvar(2, 3, '&nux'))
call assert_equal(1, gettabwinvar(2, 3, '&nux', 1))
tabonly

2
src/version.c
View File

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