aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.1942: Vim9: execution stack invalidated with null object

Browse Source 
Problem:  Vim9: execution stack invalidated with null object
Solution: Check for a null object before adjusting the execution stack

closes: #13186

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Yegappan Lakshmanan
2023-09-25 21:00:46 +02:00
committed by Christian Brabandt
parent 54e1f56cf2
commit c1946267f2
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -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 */
/**/
1942,
/**/ /**/
1941, 1941,
/**/ /**/

18
src/vim9execute.c
View File

@@ -535,6 +535,15 @@ 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 (IS_OBJECT_METHOD(ufunc) && !IS_CONSTRUCTOR_METHOD(ufunc)
&& obj->v_type == VAR_OBJECT && obj->vval.v_object == NULL)
{
// If this is not a 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;
@@ -601,15 +610,6 @@ 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;
} }