Mercurial > vim
changeset 33361:241a1c2d30fd v9.0.1942
patch 9.0.1942: Vim9: execution stack invalidated with null object
Commit: https://github.com/vim/vim/commit/c1946267f22efe3ec5eb0a1a914f30782a538983
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Mon Sep 25 21:00:46 2023 +0200
patch 9.0.1942: Vim9: execution stack invalidated with null object
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 25 Sep 2023 21:15:07 +0200 |
| parents | 77e0574450d0 |
| children | 903ad090cbf3 |
| files | src/version.c src/vim9execute.c |
| diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1942, +/**/ 1941, /**/ 1940,
--- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -535,6 +535,15 @@ 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 (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. if (check_ufunc_arg_types(ufunc, argcount, vararg_count, ectx) == FAIL) return FAIL; @@ -601,15 +610,6 @@ 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; }