Skip to content

Commit

Permalink
patch 9.0.1609: crash when an object indirectly references itself
Browse files Browse the repository at this point in the history
Problem:    Crash when an object indirectly references itself.
Solution:   Avoid clearing an object while it is already being cleared.
            (closes #12494)
  • Loading branch information
brammool committed Jun 5, 2023
1 parent 5c60684 commit f7ca56f
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 3 deletions.
27 changes: 27 additions & 0 deletions src/testdir/test_vim9_class.vim
Expand Up @@ -925,6 +925,33 @@ func Test_class_garbagecollect()
echo Point.pl Point.pd
END
call v9.CheckScriptSuccess(lines)

let lines =<< trim END
vim9script

interface View
endinterface

class Widget
this.view: View
endclass

class MyView implements View
this.widget: Widget

def new()
# this will result in a circular reference to this object
this.widget = Widget.new(this)
enddef
endclass

var view = MyView.new()

# overwrite "view", will be garbage-collected next
view = MyView.new()
test_garbagecollect_now()
END
call v9.CheckScriptSuccess(lines)
endfunc

def Test_class_function()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1609,
/**/
1608,
/**/
Expand Down
15 changes: 12 additions & 3 deletions src/vim9class.c
Expand Up @@ -1497,6 +1497,9 @@ copy_object(typval_T *from, typval_T *to)
static void
object_clear(object_T *obj)
{
// Avoid a recursive call, it can happen if "obj" has a circular reference.
obj->obj_refcount = INT_MAX;

class_T *cl = obj->obj_class;

// the member values are just after the object structure
Expand Down Expand Up @@ -1619,6 +1622,8 @@ object_created(object_T *obj)
first_object = obj;
}

static object_T *next_nonref_obj = NULL;

/*
* Call this function when an object has been cleared and is about to be freed.
* It is removed from the list headed by "first_object".
Expand All @@ -1632,6 +1637,10 @@ object_cleared(object_T *obj)
obj->obj_prev_used->obj_next_used = obj->obj_next_used;
else if (first_object == obj)
first_object = obj->obj_next_used;

// update the next object to check if needed
if (obj == next_nonref_obj)
next_nonref_obj = obj->obj_next_used;
}

/*
Expand All @@ -1641,11 +1650,10 @@ object_cleared(object_T *obj)
object_free_nonref(int copyID)
{
int did_free = FALSE;
object_T *next_obj;

for (object_T *obj = first_object; obj != NULL; obj = next_obj)
for (object_T *obj = first_object; obj != NULL; obj = next_nonref_obj)
{
next_obj = obj->obj_next_used;
next_nonref_obj = obj->obj_next_used;
if ((obj->obj_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
{
// Free the object and items it contains.
Expand All @@ -1654,6 +1662,7 @@ object_free_nonref(int copyID)
}
}

next_nonref_obj = NULL;
return did_free;
}

Expand Down

0 comments on commit f7ca56f

Please sign in to comment.