patch 8.2.4073: Coverity warns for using NULL pointer
Problem: Coverity warns for using NULL pointer.
Solution: Bail out when running out of memory. Check for running over end of
a string.
diff --git a/src/userfunc.c b/src/userfunc.c
index a227700..4072349 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1674,12 +1674,10 @@
void
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);
- else
- p = name;
semsg(_(ermsg), p);
if (p != name)
vim_free(p);
@@ -4154,6 +4152,8 @@
else
eap->skip = TRUE;
}
+ if (name == NULL)
+ goto ret_free; // out of memory
// For "export def FuncName()" in an autoload script the function name
// is stored with the legacy autoload name "dir#script#FuncName" so
diff --git a/src/version.c b/src/version.c
index 1209772..1b37a5d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4073,
+/**/
4072,
/**/
4071,