From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Mar 2015 20:11:53 +0000 (-0700)
Subject: Merge branch 'sb/leaks'
X-Git-Tag: v2.4.0-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cfe96b38fddc114c0bc98bbeab51b0f18fd102c3?hp=-c

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
---

cfe96b38fddc114c0bc98bbeab51b0f18fd102c3
diff --combined builtin/help.c
index 2ae8a1e985,a1f5a0a097..3422e73079
--- a/builtin/help.c
+++ b/builtin/help.c
@@@ -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,
@@@ -499,6 -499,7 +499,7 @@@
  	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;
  	}