# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1587905104 -7200
# Node ID 72b437855299878d9ac48a21659ffb7975c21182
# Parent  027fa081b86d4db594fcc257009f81cdfe371716
patch 8.2.0642: Vim9: using invalid index

Commit: https://github.com/vim/vim/commit/7d41aa8874a62eb399e13b94add7f0e5c4dd074b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Apr 26 14:29:56 2020 +0200

    patch 8.2.0642: Vim9: using invalid index

    Problem:    Vim9: using invalid index.
    Solution:   Check index for being valid.  Fix memory leak.

diff --git a/src/clientserver.c b/src/clientserver.c
--- a/src/clientserver.c
+++ b/src/clientserver.c
@@ -473,6 +473,7 @@ cmdsrv_main(
 # ifdef FEAT_GUI_MSWIN
 		Shell_NotifyIcon(NIM_DELETE, &ni);
 # endif
+		vim_free(done);
 	    }
 	}
 	else if (STRICMP(argv[i], "--remote-expr") == 0)
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    642,
+/**/
     641,
 /**/
     640,
diff --git a/src/vim9compile.c b/src/vim9compile.c
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -5822,12 +5822,13 @@ compile_mult_expr(char_u *arg, int cmdid
 compile_exec(char_u *line, exarg_T *eap, cctx_T *cctx)
 {
     char_u  *p;
-    int	    has_expr;
+    int	    has_expr = FALSE;
 
     if (cctx->ctx_skip == TRUE)
 	goto theend;
 
-    has_expr = (excmd_get_argt(eap->cmdidx) & (EX_XFILE | EX_EXPAND));
+    if (eap->cmdidx >= 0 && eap->cmdidx < CMD_SIZE)
+	has_expr = (excmd_get_argt(eap->cmdidx) & (EX_XFILE | EX_EXPAND));
     if (eap->cmdidx == CMD_syntax && STRNCMP(eap->arg, "include ", 8) == 0)
     {
 	// expand filename in "syntax include [@group] filename"