Merge branch 'sb/leaks'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:53 +0000 (13:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:11:53 +0000 (13:11 -0700)
Code cleanup.

* sb/leaks:
builtin/help.c: fix memory leak
bundle.c: fix memory leak
connect.c: do not leak "conn" after showing diagnosis

1  2 
builtin/help.c
diff --combined builtin/help.c
index 2ae8a1e9857f78cb46b7238519df1627ac98ae81,a1f5a0a097d8ce832987d596bb9e7026f7a0baf1..3422e7307998b9da91f85512084aeae515022a60
@@@ -171,7 -171,7 +171,7 @@@ static void exec_man_cmd(const char *cm
  {
        struct strbuf shell_cmd = STRBUF_INIT;
        strbuf_addf(&shell_cmd, "%s %s", cmd, page);
 -      execl("/bin/sh", "sh", "-c", shell_cmd.buf, (char *)NULL);
 +      execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL);
        warning(_("failed to exec '%s': %s"), cmd, strerror(errno));
  }
  
@@@ -456,7 -456,7 +456,7 @@@ static void list_common_guides_help(voi
  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,
        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;
        }