undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/leaks'

Browse Source 
Code cleanup.

* sb/leaks:
  builtin/help.c: fix memory leak
  bundle.c: fix memory leak
  connect.c: do not leak "conn" after showing diagnosis
This commit is contained in:
Junio C Hamano 2015-03-20 13:11:53 -07:00
commit cfe96b38fd
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/help.c
View File

@ -456,7 +456,7 @@ static void list_common_guides_help(void)
int cmd_help(int argc, const char **argv, const char *prefix) int cmd_help(int argc, const char **argv, const char *prefix)
{ {
int nongit; int nongit;
const char *alias; char *alias;
enum help_format parsed_help_format; enum help_format parsed_help_format;
argc = parse_options(argc, argv, prefix, builtin_help_options, 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]); alias = alias_lookup(argv[0]);
if (alias && !is_git_command(argv[0])) { if (alias && !is_git_command(argv[0])) {
printf_ln(_("`git %s' is aliased to `%s'"), argv[0], alias); printf_ln(_("`git %s' is aliased to `%s'"), argv[0], alias);
free(alias);
return 0; return 0;
} }

11
bundle.c
View File

@ -334,7 +334,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
if (e->item->flags & UNINTERESTING) if (e->item->flags & UNINTERESTING)
continue; continue;
if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1) if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
continue; goto skip_write_ref;
if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag)) if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag))
flag = 0; flag = 0;
display_ref = (flag & REF_ISSYMREF) ? e->name : ref; display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
@ -342,7 +342,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
if (e->item->type == OBJ_TAG && if (e->item->type == OBJ_TAG &&
!is_tag_in_date_range(e->item, revs)) { !is_tag_in_date_range(e->item, revs)) {
e->item->flags |= UNINTERESTING; e->item->flags |= UNINTERESTING;
continue; goto skip_write_ref;
} }
/* /*
@ -357,8 +357,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) { if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
warning(_("ref '%s' is excluded by the rev-list options"), warning(_("ref '%s' is excluded by the rev-list options"),
e->name); e->name);
free(ref); goto skip_write_ref;
continue;
} }
/* /*
* If you run "git bundle create bndl v1.0..v2.0", the * If you run "git bundle create bndl v1.0..v2.0", the
@ -388,8 +387,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
obj->flags |= SHOWN; obj->flags |= SHOWN;
add_pending_object(revs, obj, e->name); add_pending_object(revs, obj, e->name);
} }
free(ref); goto skip_write_ref;
continue;
} }
ref_count++; ref_count++;
@ -397,6 +395,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
write_or_die(bundle_fd, " ", 1); write_or_die(bundle_fd, " ", 1);
write_or_die(bundle_fd, display_ref, strlen(display_ref)); write_or_die(bundle_fd, display_ref, strlen(display_ref));
write_or_die(bundle_fd, "\n", 1); write_or_die(bundle_fd, "\n", 1);
skip_write_ref:
free(ref); free(ref);
} }

1
connect.c
View File

@ -739,6 +739,7 @@ struct child_process *git_connect(int fd[2], const char *url,
free(hostandport); free(hostandport);
free(path); free(path);
free(conn);
return NULL; return NULL;
} else { } else {
ssh = getenv("GIT_SSH_COMMAND"); ssh = getenv("GIT_SSH_COMMAND");