From ec9749f33d26162fad40714a7d21978aea10fc69 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 18 Apr 2020 20:51:40 +0200
Subject: [PATCH] patch 8.2.0596: crash in test49

Problem:    Crash in test49.
Solution:   Check the right pointer.
---
 src/testdir/test_eval.ok | Bin 11279 -> 11268 bytes
 src/userfunc.c           |   2 +-
 src/version.c            |   2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index 9ffa54157fabaf710b0af4f13d191292d206e785..ae15c9be80664a86a9eef8c9ee912c8658d37086 100644
GIT binary patch
delta 54
zcmeB=Xo=V`TT9cz!o*6!tu!yWBr`uxAulmERUtVsFE77DAvr&<Br!8jArZ*R$<Nz-
IUdw?I03C%BzW@LL

delta 16
XcmZpP=#SViTWj(?EwjzXwCorGKxPK)

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,
 /**/
-- 
2.50.1