From 2b59df00d80ea8d2c0fcf4f4ae9a018c1790206f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 22 Jul 2021 15:14:25 +0200 Subject: [PATCH] patch 8.2.3201: crash in test Problem: Crash in test. Solution: Initialize "where". --- src/eval.c | 3 +-- src/evalvars.c | 5 ++--- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/eval.c b/src/eval.c index bfe9f61361..fdee0089b3 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3368,9 +3368,8 @@ eval7t( } else { - where_T where; + where_T where = WHERE_INIT; - where.wt_index = 0; where.wt_variable = TRUE; res = check_type(want_type, actual, TRUE, where); } diff --git a/src/evalvars.c b/src/evalvars.c index c58f73491a..f73efd3dbd 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -3250,7 +3250,7 @@ set_var_const( { scriptitem_T *si = SCRIPT_ITEM(import->imp_sid); svar_T *sv; - where_T where; + where_T where = WHERE_INIT; // imported variable from another script 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; - where.wt_index = 0; where.wt_variable = TRUE; if (check_typval_type(sv->sv_type, tv, where) == FAIL || value_check_lock(sv->sv_tv->v_lock, name, FALSE)) @@ -3314,7 +3313,7 @@ set_var_const( if (var_in_vim9script) { - where_T where; + where_T where = WHERE_INIT; // check the type and adjust to bool if needed where.wt_index = var_idx; diff --git a/src/version.c b/src/version.c index 02469ed607..8d726e400b 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 */ +/**/ + 3201, /**/ 3200, /**/ -- 2.47.2