aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.4073: Coverity warns for using NULL pointer

Browse Source 
Problem:    Coverity warns for using NULL pointer.
Solution:   Bail out when running out of memory. Check for running over end of
            a string.
This commit is contained in:
Bram Moolenaar
2022-01-13 12:05:09 +00:00
parent d041f4208b
commit 54598066ca
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/userfunc.c
View File

@@ -1674,12 +1674,10 @@ deref_func_name(
void void
emsg_funcname(char *ermsg, char_u *name) emsg_funcname(char *ermsg, char_u *name)
{ {
char_u *p; char_u *p = name;
if (*name == K_SPECIAL) if (name[0] == K_SPECIAL && name[1] != NUL && name[2] != NUL)
p = concat_str((char_u *)"<SNR>", name + 3); p = concat_str((char_u *)"<SNR>", name + 3);
else
p = name;
semsg(_(ermsg), p); semsg(_(ermsg), p);
if (p != name) if (p != name)
vim_free(p); vim_free(p);
@@ -4154,6 +4152,8 @@ define_function(exarg_T *eap, char_u *name_arg, garray_T *lines_to_free)
else else
eap->skip = TRUE; eap->skip = TRUE;
} }
if (name == NULL)
goto ret_free; // out of memory
// For "export def FuncName()" in an autoload script the function name // For "export def FuncName()" in an autoload script the function name
// is stored with the legacy autoload name "dir#script#FuncName" so // is stored with the legacy autoload name "dir#script#FuncName" so

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4073,
/**/ /**/
4072, 4072,
/**/ /**/