summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-20 22:11:06 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-20 22:11:06 +0200
commit19df5cc04de93519145901d9cbc78c44d0c47c5d (patch)
tree5290dd9e2e1c09cd992112f2812a91abffbf7b50
parent397eadbe25370394e0dc3cb18766533a15b8d1c0 (diff)
downloadvim-git-19df5cc04de93519145901d9cbc78c44d0c47c5d.tar.gz
patch 7.4.2083v7.4.2083
Problem: Coverity complains about not restoring a value. Solution: Restore the value, although it's not really needed. Change return to jump to cleanup, might leak memory.
-rw-r--r--src/userfunc.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/userfunc.c b/src/userfunc.c
index 9ffafc371..ffbbc2d21 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -199,14 +199,17 @@ get_function_args(
break;
}
if (newargs != NULL && ga_grow(newargs, 1) == FAIL)
- return FAIL;
+ goto err_ret;
if (newargs != NULL)
{
c = *p;
*p = NUL;
arg = vim_strsave(arg);
if (arg == NULL)
+ {
+ *p = c;
goto err_ret;
+ }
/* Check for duplicate argument name. */
for (i = 0; i < newargs->ga_len; ++i)
diff --git a/src/version.c b/src/version.c
index acc5c33d1..69da11921 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2083,
+/**/
2082,
/**/
2081,