patch 9.0.1932: Vim9: error when using null object constructor
Commit:
https://github.com/vim/vim/commit/7398f367d5125eedfb4058c63a5d167fe8601e3d
Author: Yegappan Lakshmanan <yegap...@yahoo.com>
Date: Sun Sep 24 23:09:10 2023 +0200
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 <c...@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegap...@yahoo.com>
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 87679d814..87dc53673 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -5675,4 +5675,34 @@ def Test_dict_object_member()
v9.CheckSourceSuccess(lines)
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
diff --git a/src/version.c b/src/version.c
index b5ffdd1fe..6166111ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1932,
/**/
1931,
/**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index a53b1b3bf..2fc7f343d 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -535,15 +535,6 @@ call_dfunc(
// If this is an object method, the object is just before the arguments.
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.
if (check_ufunc_arg_types(ufunc, argcount, vararg_count, ectx) == FAIL)
return FAIL;
@@ -610,6 +601,15 @@ call_dfunc(
// the first local variable.
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;
obj->v_type = VAR_UNKNOWN;
}
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qkWRX-00A1ne-Js%40256bit.org.
