Skip to content

Commit

Permalink
patch 9.0.1624: crash when calling object constructor
Browse files Browse the repository at this point in the history
Problem:    Crash when calling object constructor from legacy script. (Israel
            Chauca Fuentes)
Solution:   Pass a pointer for "ufunc". (closes #12502)
  • Loading branch information
brammool committed Jun 10, 2023
1 parent f07d1a7 commit 5ca05fa
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2184,7 +2184,9 @@ typedef struct {
linenr_T fe_lastline; // last line of range
int *fe_doesrange; // if not NULL: return: function handled range
int fe_evaluate; // actually evaluate expressions
partial_T *fe_partial; // for extra arguments
ufunc_T *fe_ufunc; // function to be called, when NULL lookup by
// name
partial_T *fe_partial; // for "dict" and extra arguments
dict_T *fe_selfdict; // Dictionary for "self"
object_T *fe_object; // object, e.g. for "this.Func()"
typval_T *fe_basetv; // base for base->method()
Expand Down
23 changes: 23 additions & 0 deletions src/testdir/test_vim9_class.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1767,6 +1767,29 @@ def Test_closure_in_class()
v9.CheckScriptSuccess(lines)
enddef

def Test_call_constructor_from_legacy()
var lines =<< trim END
vim9script

var newCalled = 'false'

class A
def new()
newCalled = 'true'
enddef
endclass

export def F(options = {}): any
return A
enddef

g:p = F()
legacy call p.new()
assert_equal('true', newCalled)
END
v9.CheckScriptSuccess(lines)
enddef

def Test_defer_with_object()
var lines =<< trim END
vim9script
Expand Down
13 changes: 10 additions & 3 deletions src/userfunc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3665,6 +3665,9 @@ call_func(

if (partial != NULL)
fp = partial->pt_func;
if (fp == NULL)
fp = funcexe->fe_ufunc;

if (fp == NULL)
{
// Make a copy of the name, if it comes from a funcref variable it
Expand Down Expand Up @@ -4161,8 +4164,10 @@ trans_function_name_ext(

if (lv.ll_ufunc != NULL)
{
*ufunc = lv.ll_ufunc;
if (ufunc != NULL)
*ufunc = lv.ll_ufunc;
name = vim_strsave(lv.ll_ufunc->uf_name);
*pp = end;
goto theend;
}

Expand Down Expand Up @@ -5915,7 +5920,7 @@ ex_call_inner(
char_u *name,
char_u **arg,
char_u *startarg,
funcexe_T *funcexe_init,
funcexe_T *funcexe_init,
evalarg_T *evalarg)
{
linenr_T lnum;
Expand Down Expand Up @@ -6204,6 +6209,7 @@ ex_call(exarg_T *eap)
int len;
int failed = FALSE;
funcdict_T fudi;
ufunc_T *ufunc = NULL;
partial_T *partial = NULL;
evalarg_T evalarg;
type_T *type = NULL;
Expand All @@ -6227,7 +6233,7 @@ ex_call(exarg_T *eap)
}

tofree = trans_function_name_ext(&arg, NULL, FALSE, TFN_INT,
&fudi, &partial, vim9script ? &type : NULL, NULL);
&fudi, &partial, vim9script ? &type : NULL, &ufunc);
if (fudi.fd_newkey != NULL)
{
// Still need to give an error message for missing key.
Expand Down Expand Up @@ -6275,6 +6281,7 @@ ex_call(exarg_T *eap)

CLEAR_FIELD(funcexe);
funcexe.fe_check_type = type;
funcexe.fe_ufunc = ufunc;
funcexe.fe_partial = partial;
funcexe.fe_selfdict = fudi.fd_dict;
funcexe.fe_firstline = eap->line1;
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1624,
/**/
1623,
/**/
Expand Down

0 comments on commit 5ca05fa

Please sign in to comment.