1
0
forked from aniani/vim

patch 9.1.0688: Vim9: dereferences NULL pointer in check_type_is_value()

Problem:  Vim9: dereferences NULL pointer in check_type_is_value()
          (Suyue Guo)
Solution: Verify that the pointer is not Null

fixes: #15540
closes: #15545

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-08-22 21:25:18 +02:00
parent dabf07e458
commit 25618fc9ea
3 changed files with 14 additions and 2 deletions

View File

@@ -2036,6 +2036,14 @@ def Test_no_space_after_command()
v9.CheckDefExecAndScriptFailure(lines, 'E486:', 1) v9.CheckDefExecAndScriptFailure(lines, 'E486:', 1)
enddef enddef
def Test_lambda_crash()
# This used to crash Vim
var lines =<< trim END
vim9 () => super => {
END
v9.CheckScriptFailureList(lines, ["E1356:", "E1405:"])
enddef
" Test for the 'previewpopup' option " Test for the 'previewpopup' option
def Test_previewpopup() def Test_previewpopup()
set previewpopup=height:10,width:60 set previewpopup=height:10,width:60
@@ -2044,6 +2052,7 @@ def Test_previewpopup()
assert_notequal(id, 0) assert_notequal(id, 0)
assert_match('Xppfile', popup_getoptions(id).title) assert_match('Xppfile', popup_getoptions(id).title)
popup_clear() popup_clear()
bw Xppfile
set previewpopup& set previewpopup&
enddef enddef

View File

@@ -704,6 +704,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 */
/**/
688,
/**/ /**/
687, 687,
/**/ /**/

View File

@@ -2138,12 +2138,13 @@ check_type_is_value(type_T *type)
switch (type->tt_type) switch (type->tt_type)
{ {
case VAR_CLASS: case VAR_CLASS:
if (IS_ENUM(type->tt_class)) if (type->tt_class != NULL && IS_ENUM(type->tt_class))
semsg(_(e_using_enum_as_value_str), semsg(_(e_using_enum_as_value_str),
type->tt_class->class_name); type->tt_class->class_name);
else else
semsg(_(e_using_class_as_value_str), semsg(_(e_using_class_as_value_str),
type->tt_class->class_name); type->tt_class == NULL ? (char_u *)""
: type->tt_class->class_name);
return FAIL; return FAIL;
case VAR_TYPEALIAS: case VAR_TYPEALIAS: