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 9ffa54157fabaf710b0af4f13d191292d206e785..ae15c9be80664a86a9eef8c9ee912c8658d37086 100644 (file)
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 44118b1375d1d5876c3c95d33273cd7ce25b1581..dfda733a1c4bb6971a0a785e4414554f84548987 100644 (file)
--- 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 bd5bd0bfebe1621e97b8cf367aeea9cdd75c261e..bac1ac328d535c6d05839ad5cfe2d2dd2d298870 100644 (file)
--- 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,
 /**/