From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 18 Apr 2020 18:51:40 +0000 (+0200)
Subject: patch 8.2.0596: crash in test49
X-Git-Tag: v8.2.0596
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec9749f33d26162fad40714a7d21978aea10fc69;p=vim

patch 8.2.0596: crash in test49

Problem:    Crash in test49.
Solution:   Check the right pointer.
---

diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index 9ffa54157..ae15c9be8 100644
Binary files a/src/testdir/test_eval.ok and b/src/testdir/test_eval.ok 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
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    596,
 /**/
     595,
 /**/