patch 8.1.0800: may use a lot of memory when a function refers itself
Problem: May use a lot of memory when a function creates a cyclic
reference.
Solution: After saving a funccal many times, invoke the garbage collector.
(closes #3835)
diff --git a/src/userfunc.c b/src/userfunc.c
index 6887c2c..66e07b1 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -651,6 +651,7 @@
listitem_T *li;
int todo;
dictitem_T *v;
+ static int made_copy = 0;
/* "fc" is still in use. This can happen when returning "a:000",
* assigning "l:" to a global variable or defining a closure.
@@ -673,6 +674,16 @@
/* Make a copy of the a:000 items, since we didn't do that above. */
for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
copy_tv(&li->li_tv, &li->li_tv);
+
+ if (++made_copy == 10000)
+ {
+ // We have made a lot of copies. This can happen when
+ // repetitively calling a function that creates a reference to
+ // itself somehow. Call the garbage collector here to avoid using
+ // too much memory.
+ made_copy = 0;
+ (void)garbage_collect(FALSE);
+ }
}
}
@@ -723,6 +734,8 @@
line_breakcheck(); /* check for CTRL-C hit */
fc = (funccall_T *)alloc(sizeof(funccall_T));
+ if (fc == NULL)
+ return;
fc->caller = current_funccal;
current_funccal = fc;
fc->func = fp;
diff --git a/src/version.c b/src/version.c
index d5ea086..b8b0630 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 800,
+/**/
799,
/**/
798,