From efaaaa683b7b0cebc128be5c0c257b9d6578ac96 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 8 Jul 2020 22:24:09 +0200
Subject: [PATCH] patch 8.2.1162: crash when using a lambda
Problem: Crash when using a lambda.
Solution: Check for evalarg to be NULL.
---
src/userfunc.c | 4 ++--
src/version.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/userfunc.c b/src/userfunc.c
index 6858068c82..2f253c95fd 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -508,7 +508,7 @@ get_lambda_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
}
eval_lavars_used = old_eval_lavars;
- if (evalarg->eval_tofree == NULL)
+ if (evalarg != NULL && evalarg->eval_tofree == NULL)
evalarg->eval_tofree = tofree;
else
vim_free(tofree);
@@ -519,7 +519,7 @@ errret:
ga_clear_strings(&newlines);
vim_free(fp);
vim_free(pt);
- if (evalarg->eval_tofree == NULL)
+ if (evalarg != NULL && evalarg->eval_tofree == NULL)
evalarg->eval_tofree = tofree;
else
vim_free(tofree);
diff --git a/src/version.c b/src/version.c
index 8886382893..6cd091b582 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1162,
/**/
1161,
/**/
--
GitLab