From e89bfd212b21c227f026e467f882c62cdd6e642d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 18 Feb 2022 18:34:45 +0000 Subject: [PATCH] patch 8.2.4417: using NULL pointer Problem: Using NULL pointer. Solution: Set offset after checking for NULL pointer. --- src/userfunc.c | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/userfunc.c b/src/userfunc.c index 696320c3e..3e0d021ba 100644 --- 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 *funcname) ++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 index c9968125b..f95b395b7 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4417, /**/ 4416, /**/ -- 2.50.1