diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-02-18 18:34:45 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-02-18 18:34:45 +0000 |
| commit | e89bfd212b21c227f026e467f882c62cdd6e642d (patch) | |
| tree | a91f00b904a37b8875a5225aefacdd2dcdc4ae33 | |
| parent | 1fca5f3e86f08e696058fc7e86dfe41b415a78e6 (diff) | |
| download | vim-git-e89bfd212b21c227f026e467f882c62cdd6e642d.tar.gz | |
patch 8.2.4417: using NULL pointerv8.2.4417
Problem: Using NULL pointer.
Solution: Set offset after checking for NULL pointer.
| -rw-r--r-- | src/userfunc.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4417, +/**/ 4416, /**/ 4415, |