Mercurial > vim

diff src/eval.c @ 21865:c16af87df654 v8.2.1482

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1482: Vim9: crash when using a nested lambda Commit: https://github.com/vim/vim/commit/aeb2bdd0de5ce5b566509dda5ba9ad6f976063b3 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 18 22:32:03 2020 +0200 patch 8.2.1482: Vim9: crash when using a nested lambda Problem: Vim9: crash when using a nested lambda. Solution: Do not clear the growarray when not evaluating. Correct pointer when getting the next line. (closes #6731)
author Bram Moolenaar <Bram@vim.org>
date Tue, 18 Aug 2020 22:45:03 +0200
parents cd8dafe937ba
children e7e485a60caf
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -397,8 +397,10 @@ skip_expr_concatenate(
     int		vim9script = in_vim9script();
     garray_T    *gap = &evalarg->eval_ga;
     int		save_flags = evalarg == NULL ? 0 : evalarg->eval_flags;
-
-    if (vim9script
+    int		evaluate = evalarg == NULL
+			       ? FALSE : (evalarg->eval_flags & EVAL_EVALUATE);
+
+    if (vim9script && evaluate
 	       && (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL))
     {
 	ga_init2(gap, sizeof(char_u *), 10);
@@ -417,7 +419,7 @@ skip_expr_concatenate(
     if (evalarg != NULL)
 	evalarg->eval_flags = save_flags;
 
-    if (vim9script
+    if (vim9script && evaluate
 	    && (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL))
     {
 	if (evalarg->eval_ga.ga_len == 1)
@@ -5425,6 +5427,7 @@ handle_subscript(
 				     && (p[2] == '{' || ASCII_ISALPHA(p[2])))))
 	{
 	    *arg = eval_next_line(evalarg);
+	    p = *arg;
 	    check_white = FALSE;
 	}