patch 8.2.3267: Vim9: crash when disassembling using deleted script variable
Problem: Vim9: crash when disassembling a function that uses a deleted
script variable.
Solution: Check the variable still exists. (closes #8683)
diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index b151cb4..1530c90 100644
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -2241,5 +2241,53 @@
res)
enddef
+def Test_disassemble_after_reload()
+ var lines =<< trim END
+ vim9script
+ if exists('g:ThisFunc')
+ finish
+ endif
+ var name: any
+ def g:ThisFunc(): number
+ g:name = name
+ return 0
+ enddef
+ def g:ThatFunc(): number
+ name = g:name
+ return 0
+ enddef
+ END
+ lines->writefile('Xreload.vim')
+
+ source Xreload.vim
+ g:ThisFunc()
+ g:ThatFunc()
+
+ source Xreload.vim
+ var res = execute('disass g:ThisFunc')
+ assert_match('ThisFunc\_s*' ..
+ 'g:name = name\_s*' ..
+ '\d LOADSCRIPT \[deleted\] from .*/Xreload.vim\_s*' ..
+ '\d STOREG g:name\_s*' ..
+ 'return 0\_s*' ..
+ '\d PUSHNR 0\_s*' ..
+ '\d RETURN\_s*',
+ res)
+
+ res = execute('disass g:ThatFunc')
+ assert_match('ThatFunc\_s*' ..
+ 'name = g:name\_s*' ..
+ '\d LOADG g:name\_s*' ..
+ '\d STORESCRIPT \[deleted\] in .*/Xreload.vim\_s*' ..
+ 'return 0\_s*' ..
+ '\d PUSHNR 0\_s*' ..
+ '\d RETURN\_s*',
+ res)
+
+ delete('Xreload.vim')
+ delfunc g:ThisFunc
+ delfunc g:ThatFunc
+enddef
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 45cb4b6..962f002 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3267,
+/**/
3266,
/**/
3265,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index f453af7..f944fd7 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1254,26 +1254,33 @@
return vim_strnsave(str + start_byte, end_byte - start_byte);
}
+/*
+ * Get a script variable for ISN_STORESCRIPT and ISN_LOADSCRIPT.
+ * When "dfunc_idx" is negative don't give an error.
+ * Returns NULL for an error.
+ */
static svar_T *
-get_script_svar(scriptref_T *sref, ectx_T *ectx)
+get_script_svar(scriptref_T *sref, int dfunc_idx)
{
scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid);
- dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
- + ectx->ec_dfunc_idx;
+ dfunc_T *dfunc = dfunc_idx < 0 ? NULL
+ : ((dfunc_T *)def_functions.ga_data) + dfunc_idx;
svar_T *sv;
if (sref->sref_seq != si->sn_script_seq)
{
- // The script was reloaded after the function was
- // compiled, the script_idx may not be valid.
- semsg(_(e_script_variable_invalid_after_reload_in_function_str),
- dfunc->df_ufunc->uf_name_exp);
+ // The script was reloaded after the function was compiled, the
+ // script_idx may not be valid.
+ if (dfunc != NULL)
+ semsg(_(e_script_variable_invalid_after_reload_in_function_str),
+ printable_func_name(dfunc->df_ufunc));
return NULL;
}
sv = ((svar_T *)si->sn_var_vals.ga_data) + sref->sref_idx;
if (!equal_type(sv->sv_type, sref->sref_type, 0))
{
- emsg(_(e_script_variable_type_changed));
+ if (dfunc != NULL)
+ emsg(_(e_script_variable_type_changed));
return NULL;
}
return sv;
@@ -1976,7 +1983,7 @@
scriptref_T *sref = iptr->isn_arg.script.scriptref;
svar_T *sv;
- sv = get_script_svar(sref, ectx);
+ sv = get_script_svar(sref, ectx->ec_dfunc_idx);
if (sv == NULL)
goto theend;
allocate_if_null(sv->sv_tv);
@@ -2189,7 +2196,7 @@
scriptref_T *sref = iptr->isn_arg.script.scriptref;
svar_T *sv;
- sv = get_script_svar(sref, ectx);
+ sv = get_script_svar(sref, ectx->ec_dfunc_idx);
if (sv == NULL)
goto theend;
--ectx->ec_stack.ga_len;
@@ -4942,12 +4949,16 @@
break;
case ISN_LOADSCRIPT:
{
- scriptref_T *sref = iptr->isn_arg.script.scriptref;
- scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid);
- svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data)
- + sref->sref_idx;
+ scriptref_T *sref = iptr->isn_arg.script.scriptref;
+ scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid);
+ svar_T *sv;
- smsg("%s%4d LOADSCRIPT %s-%d from %s", pfx, current,
+ sv = get_script_svar(sref, -1);
+ if (sv == NULL)
+ smsg("%s%4d LOADSCRIPT [deleted] from %s",
+ pfx, current, si->sn_name);
+ else
+ smsg("%s%4d LOADSCRIPT %s-%d from %s", pfx, current,
sv->sv_name,
sref->sref_idx,
si->sn_name);
@@ -4996,7 +5007,8 @@
smsg("%s%4d LOADENV %s", pfx, current, iptr->isn_arg.string);
break;
case ISN_LOADREG:
- smsg("%s%4d LOADREG @%c", pfx, current, (int)(iptr->isn_arg.number));
+ smsg("%s%4d LOADREG @%c", pfx, current,
+ (int)(iptr->isn_arg.number));
break;
case ISN_STORE:
@@ -5004,7 +5016,8 @@
smsg("%s%4d STORE arg[%lld]", pfx, current,
iptr->isn_arg.number + STACK_FRAME_SIZE);
else
- smsg("%s%4d STORE $%lld", pfx, current, iptr->isn_arg.number);
+ smsg("%s%4d STORE $%lld", pfx, current,
+ iptr->isn_arg.number);
break;
case ISN_STOREOUTER:
{
@@ -5048,12 +5061,16 @@
break;
case ISN_STORESCRIPT:
{
- scriptref_T *sref = iptr->isn_arg.script.scriptref;
- scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid);
- svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data)
- + sref->sref_idx;
+ scriptref_T *sref = iptr->isn_arg.script.scriptref;
+ scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid);
+ svar_T *sv;
- smsg("%s%4d STORESCRIPT %s-%d in %s", pfx, current,
+ sv = get_script_svar(sref, -1);
+ if (sv == NULL)
+ smsg("%s%4d STORESCRIPT [deleted] in %s",
+ pfx, current, si->sn_name);
+ else
+ smsg("%s%4d STORESCRIPT %s-%d in %s", pfx, current,
sv->sv_name,
sref->sref_idx,
si->sn_name);
@@ -5067,7 +5084,8 @@
smsg("%s%4d STOREENV $%s", pfx, current, iptr->isn_arg.string);
break;
case ISN_STOREREG:
- smsg("%s%4d STOREREG @%c", pfx, current, (int)iptr->isn_arg.number);
+ smsg("%s%4d STOREREG @%c", pfx, current,
+ (int)iptr->isn_arg.number);
break;
case ISN_STORENR:
smsg("%s%4d STORE %lld in $%d", pfx, current,
@@ -5193,9 +5211,8 @@
+ cdfunc->cdf_idx;
smsg("%s%4d DCALL %s(argc %d)", pfx, current,
- df->df_ufunc->uf_name_exp != NULL
- ? df->df_ufunc->uf_name_exp
- : df->df_ufunc->uf_name, cdfunc->cdf_argcount);
+ printable_func_name(df->df_ufunc),
+ cdfunc->cdf_argcount);
}
break;
case ISN_UCALL:
@@ -5662,10 +5679,7 @@
semsg(_(e_function_is_not_compiled_str), eap->arg);
return;
}
- if (ufunc->uf_name_exp != NULL)
- msg((char *)ufunc->uf_name_exp);
- else
- msg((char *)ufunc->uf_name);
+ msg((char *)printable_func_name(ufunc));
dfunc = ((dfunc_T *)def_functions.ga_data) + ufunc->uf_dfunc_idx;
switch (compile_type)