summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-29 22:31:36 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-29 22:31:36 +0200
commit9b5384b97e832958573ffdcd3c1e230635b434e4 (patch)
tree84440fd6217f2bc1094893e672869651c4854da9
parent927b7dd0fe9a0a82b39d600779edb4390ecdeda6 (diff)
downloadvim-git-9b5384b97e832958573ffdcd3c1e230635b434e4.tar.gz
patch 8.2.1090: may use NULL pointer when skipping over namev8.2.1090
Problem: May use NULL pointer when skipping over name. Solution: Always set ll_name_end.
-rw-r--r--src/eval.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 141a97315..5b69dc736 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -734,7 +734,9 @@ get_lval(
{
// When skipping just find the end of the name.
lp->ll_name = name;
- return find_name_end(name, NULL, NULL, FNE_INCL_BR | fne_flags);
+ lp->ll_name_end = find_name_end(name, NULL, NULL,
+ FNE_INCL_BR | fne_flags);
+ return lp->ll_name_end;
}
// Find the end of the name.
diff --git a/src/version.c b/src/version.c
index fdf0504f0..e4d869448 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 */
/**/
+ 1090,
+/**/
1089,
/**/
1088,