From: Ernie Rael <errael@raelity.com>
Date: Mon, 19 Aug 2024 19:45:23 +0000 (+0200)
Subject: patch 9.1.0682: Vim9: Segfault with uninitialized funcref
X-Git-Tag: v9.1.0682^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb90ea9cba6f033fe141db0e466fb4117f28402b;p=thirdparty%2Fvim.git

patch 9.1.0682: Vim9: Segfault with uninitialized funcref

Problem:  Vim9: Segfault with uninitialized funcref
          (Daniel Viberg)
Solution: Check the Funcref for being Null before trying to access it
          (Ernie Rael)

fixes: #15523

Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index d07bbfba70..030ff833ef 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -164,6 +164,16 @@ def Test_wrong_function_name()
   END
   v9.CheckScriptFailure(lines, 'E1182:')
   delfunc g:Define
+
+  lines =<< trim END
+    vim9script
+    var F1_ref: func
+    def Start()
+      F1_ref()
+    enddef
+    Start()
+  END
+  v9.CheckScriptFailure(lines, 'E117:')
 enddef
 
 " Check that in a legacy script a :def accesses the correct script variables.
diff --git a/src/userfunc.c b/src/userfunc.c
index 9a82394013..5d167101d8 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2245,7 +2245,8 @@ find_func_imported(char_u *name, int flags)
 	    if (!HASHITEM_EMPTY(hi))
 	    {
 		dictitem_T *di = HI2DI(hi);
-		if (di->di_tv.v_type == VAR_FUNC)
+		if (di->di_tv.v_type == VAR_FUNC
+			&& di->di_tv.vval.v_string != NULL)
 		    func = find_func_even_dead(di->di_tv.vval.v_string, flags);
 	    }
 	}
diff --git a/src/version.c b/src/version.c
index 02b6d91dc6..c4472cf609 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    682,
 /**/
     681,
 /**/