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

patch 8.2.3201: crash in test

Browse Source 
Problem:    Crash in test.
Solution:   Initialize "where".
This commit is contained in:
Bram Moolenaar
2021-07-22 15:14:25 +02:00
parent 7a3fe3e180
commit 2b59df00d8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/eval.c
View File

@@ -3368,9 +3368,8 @@ eval7t(
} }
else else
{ {
where_T where; where_T where = WHERE_INIT;
where.wt_index = 0;
where.wt_variable = TRUE; where.wt_variable = TRUE;
res = check_type(want_type, actual, TRUE, where); res = check_type(want_type, actual, TRUE, where);
} }

5
src/evalvars.c
View File

@@ -3250,7 +3250,7 @@ set_var_const(
{ {
scriptitem_T *si = SCRIPT_ITEM(import->imp_sid); scriptitem_T *si = SCRIPT_ITEM(import->imp_sid);
svar_T *sv; svar_T *sv;
where_T where; where_T where = WHERE_INIT;
// imported variable from another script // imported variable from another script
if ((flags & ASSIGN_NO_DECL) == 0) if ((flags & ASSIGN_NO_DECL) == 0)
@@ -3260,7 +3260,6 @@ set_var_const(
} }
sv = ((svar_T *)si->sn_var_vals.ga_data) + import->imp_var_vals_idx; sv = ((svar_T *)si->sn_var_vals.ga_data) + import->imp_var_vals_idx;
where.wt_index = 0;
where.wt_variable = TRUE; where.wt_variable = TRUE;
if (check_typval_type(sv->sv_type, tv, where) == FAIL if (check_typval_type(sv->sv_type, tv, where) == FAIL
|| value_check_lock(sv->sv_tv->v_lock, name, FALSE)) || value_check_lock(sv->sv_tv->v_lock, name, FALSE))
@@ -3314,7 +3313,7 @@ set_var_const(
if (var_in_vim9script) if (var_in_vim9script)
{ {
where_T where; where_T where = WHERE_INIT;
// check the type and adjust to bool if needed // check the type and adjust to bool if needed
where.wt_index = var_idx; where.wt_index = var_idx;

2
src/version.c
View File

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