0
0
mirror of https://github.com/vim/vim.git synced 2025-09-15 23:23:38 -04:00

patch 9.0.1093: using freed memory of object member

Problem:    Using freed memory of object member. (Yegappan Lakshmanan)
Solution:   Make a copy of the object member when getting it.
This commit is contained in:
Bram Moolenaar 2022-12-24 21:24:06 +00:00
parent e86190e7c1
commit 590162cae0
3 changed files with 30 additions and 2 deletions

View File

@ -323,6 +323,32 @@ def Test_class_object_member_access()
assert_fails('trip.four = 4', 'E1334')
END
v9.CheckScriptSuccess(lines)
lines =<< trim END
vim9script
class MyCar
this.make: string
def new(make_arg: string)
this.make = make_arg
enddef
def GetMake(): string
return $"make = {this.make}"
enddef
endclass
var c = MyCar.new("abc")
assert_equal('make = abc', c.GetMake())
c = MyCar.new("def")
assert_equal('make = def', c.GetMake())
var c2 = MyCar.new("123")
assert_equal('make = 123', c2.GetMake())
END
v9.CheckScriptSuccess(lines)
enddef
def Test_class_member_access()

View File

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

View File

@ -3799,7 +3799,7 @@ exec_instructions(ectx_T *ectx)
tv->vval.v_number = iptr->isn_arg.storenr.stnr_val;
break;
// store value in list or dict variable
// Store a value in a list, dict, blob or object variable.
case ISN_STOREINDEX:
{
int res = execute_storeindex(iptr, ectx);
@ -5159,7 +5159,7 @@ exec_instructions(ectx_T *ectx)
object_T *obj = tv->vval.v_object;
// the members are located right after the object struct
typval_T *mtv = ((typval_T *)(obj + 1)) + idx;
*tv = *mtv;
copy_tv(mtv, tv);
// Unreference the object after getting the member, it may
// be freed.