summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-18 20:51:40 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-18 20:51:40 +0200
commitec9749f33d26162fad40714a7d21978aea10fc69 (patch)
treedae4e93e5d90702f4d180525d4bd16f081655b6d
parenta26b9700d73ebccd6c5459d0d66032a4249f6b72 (diff)
downloadvim-git-ec9749f33d26162fad40714a7d21978aea10fc69.tar.gz
patch 8.2.0596: crash in test49v8.2.0596
Problem: Crash in test49. Solution: Check the right pointer.
-rw-r--r--src/testdir/test_eval.okbin11279 -> 11268 bytes
-rw-r--r--src/userfunc.c2
-rw-r--r--src/version.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index 9ffa54157..ae15c9be8 100644
--- a/src/testdir/test_eval.ok
+++ b/src/testdir/test_eval.ok
Binary files differ
diff --git a/src/userfunc.c b/src/userfunc.c
index 44118b137..dfda733a1 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2504,7 +2504,7 @@ ex_function(exarg_T *eap)
// With Vim9 script the name was made script-local, if not
// found try again with the original name.
- if (p != NULL)
+ if (up != NULL)
fp = find_func(up, NULL);
}
diff --git a/src/version.c b/src/version.c
index bd5bd0bfe..bac1ac328 100644
--- 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 */
/**/
+ 596,
+/**/
595,
/**/
594,