mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 9.0.1932: Vim9: error when using null object constructor
Problem: Vim9: error when using null object constructor Solution: Check for a null object only when calling an object method closes: #13154 closes: #13163 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
committed by
Christian Brabandt
parent
960822a11f
commit
7398f367d5
@@ -5675,4 +5675,34 @@ def Test_dict_object_member()
|
|||||||
v9.CheckSourceSuccess(lines)
|
v9.CheckSourceSuccess(lines)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
" The following test was failing after 9.0.1914. This was caused by using a
|
||||||
|
" freed object from a previous method call.
|
||||||
|
def Test_freed_object_from_previous_method_call()
|
||||||
|
var lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
|
||||||
|
class Context
|
||||||
|
endclass
|
||||||
|
|
||||||
|
class Result
|
||||||
|
endclass
|
||||||
|
|
||||||
|
def Failure(): Result
|
||||||
|
return Result.new()
|
||||||
|
enddef
|
||||||
|
|
||||||
|
def GetResult(ctx: Context): Result
|
||||||
|
return Failure()
|
||||||
|
enddef
|
||||||
|
|
||||||
|
def Test_GetResult()
|
||||||
|
var ctx = Context.new()
|
||||||
|
var result = GetResult(ctx)
|
||||||
|
enddef
|
||||||
|
|
||||||
|
Test_GetResult()
|
||||||
|
END
|
||||||
|
v9.CheckSourceSuccess(lines)
|
||||||
|
enddef
|
||||||
|
|
||||||
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
1932,
|
||||||
/**/
|
/**/
|
||||||
1931,
|
1931,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -535,15 +535,6 @@ call_dfunc(
|
|||||||
// If this is an object method, the object is just before the arguments.
|
// If this is an object method, the object is just before the arguments.
|
||||||
typval_T *obj = STACK_TV_BOT(0) - argcount - vararg_count - 1;
|
typval_T *obj = STACK_TV_BOT(0) - argcount - vararg_count - 1;
|
||||||
|
|
||||||
if (obj->v_type == VAR_OBJECT && obj->vval.v_object == NULL
|
|
||||||
&& !IS_CONSTRUCTOR_METHOD(ufunc))
|
|
||||||
{
|
|
||||||
// If this is not the constructor method, then a valid object is
|
|
||||||
// needed.
|
|
||||||
emsg(_(e_using_null_object));
|
|
||||||
return FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check the argument types.
|
// Check the argument types.
|
||||||
if (check_ufunc_arg_types(ufunc, argcount, vararg_count, ectx) == FAIL)
|
if (check_ufunc_arg_types(ufunc, argcount, vararg_count, ectx) == FAIL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
@@ -610,6 +601,15 @@ call_dfunc(
|
|||||||
// the first local variable.
|
// the first local variable.
|
||||||
if (IS_OBJECT_METHOD(ufunc))
|
if (IS_OBJECT_METHOD(ufunc))
|
||||||
{
|
{
|
||||||
|
if (obj->v_type == VAR_OBJECT && obj->vval.v_object == NULL
|
||||||
|
&& !IS_CONSTRUCTOR_METHOD(ufunc))
|
||||||
|
{
|
||||||
|
// If this is not a constructor method, then a valid object is
|
||||||
|
// needed.
|
||||||
|
emsg(_(e_using_null_object));
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
*STACK_TV_VAR(0) = *obj;
|
*STACK_TV_VAR(0) = *obj;
|
||||||
obj->v_type = VAR_UNKNOWN;
|
obj->v_type = VAR_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user