patch 9.1.1415: potential use-after free when there is an error in 'tabpanel'
Problem: potential use-after free when there is an error in 'tabpanel'
option (@char101, after v9.1.1391)
Solution: check if p_tpl has been set to null before accessing it again.
While at it slightly change starts_with_percent_and_bang() and use the
existing opt_name and opt_scope variables.
fixes: #17364
closes: #17388
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@ -530,8 +530,8 @@ starts_with_percent_and_bang(tabpanel_T *pargs)
|
|||||||
if (did_emsg > did_emsg_before)
|
if (did_emsg > did_emsg_before)
|
||||||
{
|
{
|
||||||
usefmt = NULL;
|
usefmt = NULL;
|
||||||
set_string_option_direct((char_u *)"tabpanel", -1, (char_u *)"",
|
set_string_option_direct(opt_name, -1, (char_u *)"",
|
||||||
OPT_FREE | OPT_GLOBAL, SID_ERROR);
|
OPT_FREE | opt_scope, SID_ERROR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -641,6 +641,12 @@ do_by_tplmode(
|
|||||||
args.prow = &row;
|
args.prow = &row;
|
||||||
args.pcol = &col;
|
args.pcol = &col;
|
||||||
draw_tabpanel_userdefined(tplmode, &args);
|
draw_tabpanel_userdefined(tplmode, &args);
|
||||||
|
// p_tpl could have been freed in build_stl_str_hl()
|
||||||
|
if (p_tpl == NULL || *p_tpl == NUL)
|
||||||
|
{
|
||||||
|
usefmt = NULL;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
p += i;
|
p += i;
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|||||||
@ -529,6 +529,14 @@ function Test_tabpanel_error()
|
|||||||
catch /^Vim\%((\a\+)\)\=:E117:/
|
catch /^Vim\%((\a\+)\)\=:E117:/
|
||||||
endtry
|
endtry
|
||||||
call assert_true(empty(&tabpanel))
|
call assert_true(empty(&tabpanel))
|
||||||
|
|
||||||
|
try
|
||||||
|
set tabpanel=%{my#util#TabPanelHighlight}%t
|
||||||
|
redraw!
|
||||||
|
catch /^Vim\%((\a\+)\)\=:E121:/
|
||||||
|
endtry
|
||||||
|
call assert_true(empty(&tabpanel))
|
||||||
|
|
||||||
set tabpanel&vim
|
set tabpanel&vim
|
||||||
set showtabpanel&vim
|
set showtabpanel&vim
|
||||||
endfunc
|
endfunc
|
||||||
|
|||||||
@ -709,6 +709,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 */
|
||||||
|
/**/
|
||||||
|
1415,
|
||||||
/**/
|
/**/
|
||||||
1414,
|
1414,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user