summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-20 13:11:53 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-20 13:11:53 -0700
commitcfe96b38fddc114c0bc98bbeab51b0f18fd102c3 (patch)
tree257f93be22b4abcf5626c6d5f47268ace4dbec87 /builtin
parentdaea6fca3564e880dfe29bfab65fd5b608e9491d (diff)
parentfd2014d42b3a4fb865d99e9a7943caa08082cada (diff)
downloadgit-cfe96b38fddc114c0bc98bbeab51b0f18fd102c3.tar.gz
Merge branch 'sb/leaks'
Code cleanup. * sb/leaks: builtin/help.c: fix memory leak bundle.c: fix memory leak connect.c: do not leak "conn" after showing diagnosis
Diffstat (limited to 'builtin')
-rw-r--r--builtin/help.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/help.c b/builtin/help.c
index 2ae8a1e985..3422e73079 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -456,7 +456,7 @@ static void list_common_guides_help(void)
int cmd_help(int argc, const char **argv, const char *prefix)
{
int nongit;
- const char *alias;
+ char *alias;
enum help_format parsed_help_format;
argc = parse_options(argc, argv, prefix, builtin_help_options,
@@ -499,6 +499,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
alias = alias_lookup(argv[0]);
if (alias && !is_git_command(argv[0])) {
printf_ln(_("`git %s' is aliased to `%s'"), argv[0], alias);
+ free(alias);
return 0;
}