patch 9.0.1079: leaking memory when defining a user command fails
Problem: Leaking memory when defining a user command fails.
Solution: Free "compl_arg" when needed. (closes #11726)
diff --git a/src/usercmd.c b/src/usercmd.c
index d878332..3bd6fd5 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -1167,7 +1167,7 @@
end = skiptowhite(p);
if (uc_scan_attr(p, end - p, &argt, &def, &flags, &compl,
&compl_arg, &addr_type_arg) == FAIL)
- return;
+ goto theend;
p = skipwhite(end);
}
@@ -1179,7 +1179,7 @@
if (!ends_excmd2(eap->arg, p) && !VIM_ISWHITE(*p))
{
emsg(_(e_invalid_command_name));
- return;
+ goto theend;
}
end = p;
name_len = (int)(end - name);
@@ -1188,13 +1188,19 @@
// we are listing commands
p = skipwhite(end);
if (!has_attr && ends_excmd2(eap->arg, p))
+ {
uc_list(name, end - name);
+ }
else if (!ASCII_ISUPPER(*name))
+ {
emsg(_(e_user_defined_commands_must_start_with_an_uppercase_letter));
+ }
else if ((name_len == 1 && *name == 'X')
|| (name_len <= 4
&& STRNCMP(name, "Next", name_len > 4 ? 4 : name_len) == 0))
+ {
emsg(_(e_reserved_name_cannot_be_used_for_user_defined_command));
+ }
else if (compl > 0 && (argt & EX_EXTRA) == 0)
{
// Some plugins rely on silently ignoring the mistake, only make this
@@ -1215,7 +1221,12 @@
uc_add_command(name, end - name, p, argt, def, flags, compl, compl_arg,
addr_type_arg, eap->forceit);
vim_free(tofree);
+
+ return; // success
}
+
+theend:
+ vim_free(compl_arg);
}
/*