summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-01 16:00:44 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-01 16:00:44 +0200
commit086eb18ba16164ca5258068cff9c4b2db742f2ef (patch)
tree944c4eca8f96d6cd3794834f2683abe821a931a0
parentd58d4f90aeb381045000ea46493b5bd9b9d1fa23 (diff)
downloadvim-git-086eb18ba16164ca5258068cff9c4b2db742f2ef.tar.gz
patch 8.2.1109: still crashing when using s:variablev8.2.1109
Problem: Still crashing when using s:variable. Solution: Remove assignment. (Ken Takata)
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 2691996ad..128fe6c40 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1109,
+/**/
1108,
/**/
1107,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index fdb422bf2..b3ed77d75 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2336,7 +2336,7 @@ get_script_item_idx(int sid, char_u *name, int check_writable)
imported_T *
find_imported(char_u *name, size_t len, cctx_T *cctx)
{
- scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
+ scriptitem_T *si;
int idx;
if (current_sctx.sc_sid <= 0)