changeset 25328:0aac8880d74d v8.2.3201

patch 8.2.3201: crash in test Commit: https://github.com/vim/vim/commit/2b59df00d80ea8d2c0fcf4f4ae9a018c1790206f Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 22 15:14:25 2021 +0200 patch 8.2.3201: crash in test Problem: Crash in test. Solution: Initialize "where".
author Bram Moolenaar <Bram@vim.org>
date Thu, 22 Jul 2021 15:15:04 +0200
parents 2c14f38d3a73
children d62fad3c95ae
files src/eval.c src/evalvars.c src/version.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -3368,9 +3368,8 @@ eval7t(
 		}
 		else
 		{
-		    where_T where;
-
-		    where.wt_index = 0;
+		    where_T where = WHERE_INIT;
+
 		    where.wt_variable = TRUE;
 		    res = check_type(want_type, actual, TRUE, where);
 		}
--- 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;
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3201,
+/**/
     3200,
 /**/
     3199,