mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 9.0.1830: Vim9: crash when accessing a null object
Problem: Vim9: crash when accessing a null object Solution: Check accessing a NULL object in def function An object is NULL when the variable is declared, but the constructor isn't called. Accessing/setting a member on the object crashed Vim. Note: this happens inside def functions, at script level things work differently. Accessing a NULL object member results in E1360 (correctly), while setting a value on it results in E1012 (type mismatch) so there's still something to fix. closes: #12973 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Gianmaria Bajo <mg1979.git@gmail.com>
This commit is contained in:
committed by
Christian Brabandt
parent
eb91e24d5e
commit
d7085a0635
@@ -1180,6 +1180,61 @@ def Test_class_member()
|
|||||||
END
|
END
|
||||||
v9.CheckScriptFailure(lines, 'E1010:')
|
v9.CheckScriptFailure(lines, 'E1010:')
|
||||||
|
|
||||||
|
# Test for setting a member on a null object
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
class A
|
||||||
|
this.val: string
|
||||||
|
endclass
|
||||||
|
|
||||||
|
def F()
|
||||||
|
var obj: A
|
||||||
|
obj.val = ""
|
||||||
|
enddef
|
||||||
|
F()
|
||||||
|
END
|
||||||
|
v9.CheckScriptFailure(lines, 'E1360: Using a null object')
|
||||||
|
|
||||||
|
# Test for accessing a member on a null object
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
class A
|
||||||
|
this.val: string
|
||||||
|
endclass
|
||||||
|
|
||||||
|
def F()
|
||||||
|
var obj: A
|
||||||
|
echo obj.val
|
||||||
|
enddef
|
||||||
|
F()
|
||||||
|
END
|
||||||
|
v9.CheckScriptFailure(lines, 'E1360: Using a null object')
|
||||||
|
|
||||||
|
# Test for setting a member on a null object, at script level
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
class A
|
||||||
|
this.val: string
|
||||||
|
endclass
|
||||||
|
|
||||||
|
var obj: A
|
||||||
|
obj.val = ""
|
||||||
|
END
|
||||||
|
# FIXME(in source): this should give E1360 as well!
|
||||||
|
v9.CheckScriptFailure(lines, 'E1012: Type mismatch; expected object<A> but got string')
|
||||||
|
|
||||||
|
# Test for accessing a member on a null object, at script level
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
class A
|
||||||
|
this.val: string
|
||||||
|
endclass
|
||||||
|
|
||||||
|
var obj: A
|
||||||
|
echo obj.val
|
||||||
|
END
|
||||||
|
v9.CheckScriptFailure(lines, 'E1360: Using a null object')
|
||||||
|
|
||||||
# Test for no space before or after the '=' when initializing a member
|
# Test for no space before or after the '=' when initializing a member
|
||||||
# variable
|
# variable
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
|
@@ -699,6 +699,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 */
|
||||||
|
/**/
|
||||||
|
1830,
|
||||||
/**/
|
/**/
|
||||||
1829,
|
1829,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -2147,7 +2147,14 @@ execute_storeindex(isn_T *iptr, ectx_T *ectx)
|
|||||||
// -1 dict, list, blob or object
|
// -1 dict, list, blob or object
|
||||||
tv = STACK_TV_BOT(-3);
|
tv = STACK_TV_BOT(-3);
|
||||||
SOURCING_LNUM = iptr->isn_lnum;
|
SOURCING_LNUM = iptr->isn_lnum;
|
||||||
if (dest_type == VAR_ANY)
|
|
||||||
|
// Make sure an object has been initialized
|
||||||
|
if (dest_type == VAR_OBJECT && tv_dest->vval.v_object == NULL)
|
||||||
|
{
|
||||||
|
emsg(_(e_using_null_object));
|
||||||
|
status = FAIL;
|
||||||
|
}
|
||||||
|
else if (dest_type == VAR_ANY)
|
||||||
{
|
{
|
||||||
dest_type = tv_dest->v_type;
|
dest_type = tv_dest->v_type;
|
||||||
if (dest_type == VAR_DICT)
|
if (dest_type == VAR_DICT)
|
||||||
|
Reference in New Issue
Block a user