summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-03-08 20:47:14 +0100
committerBram Moolenaar <Bram@vim.org>2021-03-08 20:47:14 +0100
commitd00a7fb81aff367c5dd5d86fb3883f1e7a58fed5 (patch)
tree531a70937f9c8806b3f3dce2965140ffe16f8f0a
parent86c3a2162c2e78b4f0b87b47779cc1452990ee1b (diff)
downloadvim-git-d00a7fb81aff367c5dd5d86fb3883f1e7a58fed5.tar.gz
patch 8.2.2579: Vim9: crash in garbagecollect after for loopv8.2.2579
Problem: Vim9: crash in garbagecollect after for loop. Solution: Do not set a reference in script item when the name was cleared. (closes #7935)
-rw-r--r--src/evalvars.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/evalvars.c b/src/evalvars.c
index 22d39a72f..eac66b2b9 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -319,7 +319,8 @@ garbage_collect_scriptvars(int copyID)
{
svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;
- abort = abort || set_ref_in_item(sv->sv_tv, copyID, NULL, NULL);
+ if (sv->sv_name != NULL)
+ abort = abort || set_ref_in_item(sv->sv_tv, copyID, NULL, NULL);
}
}
diff --git a/src/version.c b/src/version.c
index 6c9617596..4a4d65a21 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2579,
+/**/
2578,
/**/
2577,