diff src/evalvars.c @ 22602:2c77ec32deeb v8.2.1849

patch 8.2.1849: Vim9: garbage collection frees block-local variables Commit: https://github.com/vim/vim/commit/ed234f24f3a6d697ba9b786d0bc74d4682bfdf47 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 15 20:42:20 2020 +0200 patch 8.2.1849: Vim9: garbage collection frees block-local variables Problem: Vim9: garbage collection frees block-local variables. Solution: Mark all script variables as used.
author Bram Moolenaar <Bram@vim.org>
date Thu, 15 Oct 2020 20:45:05 +0200
parents 209c7aa56325
children 87987c783087
line wrap: on
line diff
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -303,12 +303,24 @@ garbage_collect_vimvars(int copyID)
     int
 garbage_collect_scriptvars(int copyID)
 {
-    int		i;
-    int		abort = FALSE;
+    int		    i;
+    int		    idx;
+    int		    abort = FALSE;
+    scriptitem_T    *si;
 
     for (i = 1; i <= script_items.ga_len; ++i)
+    {
 	abort = abort || set_ref_in_ht(&SCRIPT_VARS(i), copyID, NULL);
 
+	si = SCRIPT_ITEM(i);
+	for (idx = 0; idx < si->sn_var_vals.ga_len; ++idx)
+	{
+	    svar_T    *sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;
+
+	    abort = abort || set_ref_in_item(sv->sv_tv, copyID, NULL, NULL);
+	}
+    }
+
     return abort;
 }