thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1207: Vim9: crash in expr test when run in the GUI

Browse Source 
Problem:    Vim9: crash in expr test when run in the GUI.
Solution:   Break out of loop over hashtab also when function got removed and
            added.
This commit is contained in:
Bram Moolenaar
2020-07-14 15:01:05 +02:00
parent 1bce831e13
commit 7ce85be63b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_vim9_expr.vim
View File

@@ -1563,10 +1563,8 @@ def Test_expr7_method_call()
enddef
func Test_expr7_trailing_fails()
" Temporarily commented out - somehow crash occurs with too many
" CheckDefFailure calls in the GUI only.
" call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)}'], 'E107')
" call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274')
call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)}'], 'E107')
call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274')
endfunc
func Test_expr_fails()

12
src/userfunc.c
View File

@@ -3444,8 +3444,8 @@ ex_function(exarg_T *eap)
void
ex_defcompile(exarg_T *eap UNUSED)
{
long_u ht_used = func_hashtab.ht_used;
int todo = (int)ht_used;
long todo = (long)func_hashtab.ht_used;
int changed = func_hashtab.ht_changed;
hashitem_T *hi;
ufunc_T *ufunc;
@@ -3460,12 +3460,12 @@ ex_defcompile(exarg_T *eap UNUSED)
{
compile_def_function(ufunc, FALSE, NULL);
if (func_hashtab.ht_used != ht_used)
if (func_hashtab.ht_changed != changed)
{
// another function has been defined, need to start over
// a function has been added or removed, need to start over
todo = (long)func_hashtab.ht_used;
changed = func_hashtab.ht_changed;
hi = func_hashtab.ht_array;
ht_used = func_hashtab.ht_used;
todo = (int)ht_used;
--hi;
}
}

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1207,
/**/
1206,
/**/