0
0
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00

patch 9.0.1205: crash when handling class that extends another class

Problem:    Crash when handling class that extends another class with more
            than one object members.
Solution:   Correct pointer computations. (closes #11824)
This commit is contained in:
Bram Moolenaar 2023-01-15 20:49:00 +00:00
parent 912bfee710
commit ae3205aa55
3 changed files with 27 additions and 4 deletions

View File

@ -1081,6 +1081,26 @@ def Test_class_extends()
var c = Child.new()
END
v9.CheckScriptFailure(lines, 'E1325: Method not found on class "Child": new(')
# base class with more than one object member
lines =<< trim END
vim9script
class Result
this.success: bool
this.value: any = null
endclass
class Success extends Result
def new(this.value = v:none)
this.success = true
enddef
endclass
var v = Success.new('asdf')
assert_equal("object of Success {success: true, value: 'asdf'}", string(v))
END
v9.CheckScriptSuccess(lines)
enddef
def Test_class_import()

View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1205,
/**/
1204,
/**/

View File

@ -182,10 +182,11 @@ add_members_to_class(
for (int i = 0; i < parent_count; ++i)
{
// parent members need to be copied
*members[i] = parent_members[i];
members[i]->ocm_name = vim_strsave(members[i]->ocm_name);
if (members[i]->ocm_init != NULL)
members[i]->ocm_init = vim_strsave(members[i]->ocm_init);
ocmember_T *m = *members + i;
*m = parent_members[i];
m->ocm_name = vim_strsave(m->ocm_name);
if (m->ocm_init != NULL)
m->ocm_init = vim_strsave(m->ocm_init);
}
if (gap->ga_len > 0)
// new members are moved