Merge branch 'ab/various-leak-fixes'
Various leak fixes. * ab/various-leak-fixes: built-ins: use free() not UNLEAK() if trivial, rm dead code revert: fix parse_options_concat() leak cherry-pick: free "struct replay_opts" members rebase: don't leak on "--abort" connected.c: free the "struct packed_git" sequencer.c: fix "opts->strategy" leak in read_strategy_opts() ls-files: fix a --with-tree memory leak revision API: call graph_clear() in release_revisions() unpack-file: fix ancient leak in create_temp_file() built-ins & libs & helpers: add/move destructors, fix leaks dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache" read-cache.c: clear and free "sparse_checkout_patterns" commit: discard partial cache before (re-)reading it {reset,merge}: call discard_index() before returning tests: mark tests as passing with SANITIZE=leak
This commit is contained in:
@ -1322,6 +1322,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
if (reset_head(the_repository, &ropts) < 0)
|
||||
die(_("could not move back to %s"),
|
||||
oid_to_hex(&options.orig_head->object.oid));
|
||||
strbuf_release(&head_msg);
|
||||
remove_branch_state(the_repository, 0);
|
||||
ret = finish_rebase(&options);
|
||||
goto cleanup;
|
||||
@ -1828,10 +1829,13 @@ cleanup:
|
||||
strbuf_release(&revisions);
|
||||
free(options.reflog_action);
|
||||
free(options.head_name);
|
||||
strvec_clear(&options.git_am_opts);
|
||||
free(options.gpg_sign_opt);
|
||||
free(options.cmd);
|
||||
free(options.strategy);
|
||||
strbuf_release(&options.git_format_patch_opt);
|
||||
free(squash_onto_name);
|
||||
string_list_clear(&exec, 0);
|
||||
string_list_clear(&strategy_options, 0);
|
||||
return !!ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user