# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1645209903 -3600
# Node ID 40ae50de0d2774b3c8ec52bf9010f1feafd3276a
# Parent  7ec5d3ebe807235312b8f00e089d8a931f0f3cd7
patch 8.2.4417: using NULL pointer

Commit: https://github.com/vim/vim/commit/e89bfd212b21c227f026e467f882c62cdd6e642d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Feb 18 18:34:45 2022 +0000

    patch 8.2.4417: using NULL pointer

    Problem:    Using NULL pointer.
    Solution:   Set offset after checking for NULL pointer.

diff --git a/src/userfunc.c b/src/userfunc.c
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -4024,7 +4024,7 @@ untrans_function_name(char_u *name)
 get_scriptlocal_funcname(char_u *funcname)
 {
     char	sid_buf[25];
-    int		off = *funcname == 's' ? 2 : 5;
+    int		off;
     char_u	*newname;
     char_u	*p = funcname;
 
@@ -4047,6 +4047,8 @@ get_scriptlocal_funcname(char_u *funcnam
 	++p;
 	off = 0;
     }
+    else
+	off = *funcname == 's' ? 2 : 5;
 
     if (!SCRIPT_ID_VALID(current_sctx.sc_sid))
     {
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4417,
+/**/
     4416,
 /**/
     4415,