changeset 20081:75589416d02d v8.2.0596

patch 8.2.0596: crash in test49 Commit: https://github.com/vim/vim/commit/ec9749f33d26162fad40714a7d21978aea10fc69 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Apr 18 20:51:40 2020 +0200 patch 8.2.0596: crash in test49 Problem: Crash in test49. Solution: Check the right pointer.
author Bram Moolenaar <Bram@vim.org>
date Sat, 18 Apr 2020 21:00:03 +0200
parents bcec8cadb7f7
children 7183cb9ca180
files src/testdir/test_eval.ok src/userfunc.c src/version.c
diffstat 3 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
index 9ffa54157fabaf710b0af4f13d191292d206e785..ae15c9be80664a86a9eef8c9ee912c8658d37086
GIT binary patch
literal 11268
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
--- 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);
 	    }
 
--- 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,