 9a863b3358
			
		
	
	9a863b3358
	
	
	
		
			
			setup_unpack_trees_porcelain() populates various fields on
unpack_tree_opts, we need to call clear_unpack_trees_porcelain() to
avoid leaking them. Specifically, we used to leak
unpack_tree_opts.msgs_to_free.
We have to do this in leave_reset_head because there are multiple
scenarios where unpack_tree_opts has already been configured, followed
by a 'goto leave_reset_head'. But we can also 'goto leave_reset_head'
prior to having initialised unpack_tree_opts via memset(..., 0, ...).
Therefore we also move unpack_tree_opts initialisation to the start of
reset_head(), and convert it to use brace initialisation - which
guarantees that we can never clear an uninitialised unpack_tree_opts.
clear_unpack_tree_opts() is always safe to call as long as
unpack_tree_opts is at least zero-initialised, i.e. it does not depend
on a previous call to setup_unpack_trees_porcelain().
LSAN output from t0021:
Direct leak of 192 byte(s) in 1 object(s) allocated from:
    #0 0x49ab49 in realloc ../projects/compiler-rt/lib/asan/asan_malloc_linux.cpp:164:3
    #1 0xa721e5 in xrealloc wrapper.c:126:8
    #2 0x9f7861 in strvec_push_nodup strvec.c:19:2
    #3 0x9f7861 in strvec_pushf strvec.c:39:2
    #4 0xa43e14 in setup_unpack_trees_porcelain unpack-trees.c:129:3
    #5 0x97e011 in reset_head reset.c:53:2
    #6 0x61dfa5 in cmd_rebase builtin/rebase.c:1991:9
    #7 0x4ce83e in run_builtin git.c:475:11
    #8 0x4ccafe in handle_builtin git.c:729:3
    #9 0x4cb01c in run_argv git.c:818:4
    #10 0x4cb01c in cmd_main git.c:949:19
    #11 0x6b3f3d in main common-main.c:52:11
    #12 0x7fa8addf3349 in __libc_start_main (/lib64/libc.so.6+0x24349)
Indirect leak of 147 byte(s) in 1 object(s) allocated from:
    #0 0x49ab49 in realloc ../projects/compiler-rt/lib/asan/asan_malloc_linux.cpp:164:3
    #1 0xa721e5 in xrealloc wrapper.c:126:8
    #2 0x9e8d54 in strbuf_grow strbuf.c:98:2
    #3 0x9e8d54 in strbuf_vaddf strbuf.c:401:3
    #4 0x9f7774 in strvec_pushf strvec.c:36:2
    #5 0xa43e14 in setup_unpack_trees_porcelain unpack-trees.c:129:3
    #6 0x97e011 in reset_head reset.c:53:2
    #7 0x61dfa5 in cmd_rebase builtin/rebase.c:1991:9
    #8 0x4ce83e in run_builtin git.c:475:11
    #9 0x4ccafe in handle_builtin git.c:729:3
    #10 0x4cb01c in run_argv git.c:818:4
    #11 0x4cb01c in cmd_main git.c:949:19
    #12 0x6b3f3d in main common-main.c:52:11
    #13 0x7fa8addf3349 in __libc_start_main (/lib64/libc.so.6+0x24349)
Indirect leak of 134 byte(s) in 1 object(s) allocated from:
    #0 0x49ab49 in realloc ../projects/compiler-rt/lib/asan/asan_malloc_linux.cpp:164:3
    #1 0xa721e5 in xrealloc wrapper.c:126:8
    #2 0x9e8d54 in strbuf_grow strbuf.c:98:2
    #3 0x9e8d54 in strbuf_vaddf strbuf.c:401:3
    #4 0x9f7774 in strvec_pushf strvec.c:36:2
    #5 0xa43fe4 in setup_unpack_trees_porcelain unpack-trees.c:168:3
    #6 0x97e011 in reset_head reset.c:53:2
    #7 0x61dfa5 in cmd_rebase builtin/rebase.c:1991:9
    #8 0x4ce83e in run_builtin git.c:475:11
    #9 0x4ccafe in handle_builtin git.c:729:3
    #10 0x4cb01c in run_argv git.c:818:4
    #11 0x4cb01c in cmd_main git.c:949:19
    #12 0x6b3f3d in main common-main.c:52:11
    #13 0x7fa8addf3349 in __libc_start_main (/lib64/libc.so.6+0x24349)
Indirect leak of 130 byte(s) in 1 object(s) allocated from:
    #0 0x49ab49 in realloc ../projects/compiler-rt/lib/asan/asan_malloc_linux.cpp:164:3
    #1 0xa721e5 in xrealloc wrapper.c:126:8
    #2 0x9e8d54 in strbuf_grow strbuf.c:98:2
    #3 0x9e8d54 in strbuf_vaddf strbuf.c:401:3
    #4 0x9f7774 in strvec_pushf strvec.c:36:2
    #5 0xa43f20 in setup_unpack_trees_porcelain unpack-trees.c:150:3
    #6 0x97e011 in reset_head reset.c:53:2
    #7 0x61dfa5 in cmd_rebase builtin/rebase.c:1991:9
    #8 0x4ce83e in run_builtin git.c:475:11
    #9 0x4ccafe in handle_builtin git.c:729:3
    #10 0x4cb01c in run_argv git.c:818:4
    #11 0x4cb01c in cmd_main git.c:949:19
    #12 0x6b3f3d in main common-main.c:52:11
    #13 0x7fa8addf3349 in __libc_start_main (/lib64/libc.so.6+0x24349)
SUMMARY: AddressSanitizer: 603 byte(s) leaked in 4 allocation(s).
Signed-off-by: Andrzej Hunt <andrzej@ahunt.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
	
		
			
				
	
	
		
			142 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			142 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "git-compat-util.h"
 | |
| #include "cache-tree.h"
 | |
| #include "lockfile.h"
 | |
| #include "refs.h"
 | |
| #include "reset.h"
 | |
| #include "run-command.h"
 | |
| #include "tree-walk.h"
 | |
| #include "tree.h"
 | |
| #include "unpack-trees.h"
 | |
| 
 | |
| int reset_head(struct repository *r, struct object_id *oid, const char *action,
 | |
| 	       const char *switch_to_branch, unsigned flags,
 | |
| 	       const char *reflog_orig_head, const char *reflog_head,
 | |
| 	       const char *default_reflog_action)
 | |
| {
 | |
| 	unsigned detach_head = flags & RESET_HEAD_DETACH;
 | |
| 	unsigned reset_hard = flags & RESET_HEAD_HARD;
 | |
| 	unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
 | |
| 	unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
 | |
| 	unsigned update_orig_head = flags & RESET_ORIG_HEAD;
 | |
| 	struct object_id head_oid;
 | |
| 	struct tree_desc desc[2] = { { NULL }, { NULL } };
 | |
| 	struct lock_file lock = LOCK_INIT;
 | |
| 	struct unpack_trees_options unpack_tree_opts = { 0 };
 | |
| 	struct tree *tree;
 | |
| 	const char *reflog_action;
 | |
| 	struct strbuf msg = STRBUF_INIT;
 | |
| 	size_t prefix_len;
 | |
| 	struct object_id *orig = NULL, oid_orig,
 | |
| 		*old_orig = NULL, oid_old_orig;
 | |
| 	int ret = 0, nr = 0;
 | |
| 
 | |
| 	if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
 | |
| 		BUG("Not a fully qualified branch: '%s'", switch_to_branch);
 | |
| 
 | |
| 	if (!refs_only && repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0) {
 | |
| 		ret = -1;
 | |
| 		goto leave_reset_head;
 | |
| 	}
 | |
| 
 | |
| 	if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) {
 | |
| 		ret = error(_("could not determine HEAD revision"));
 | |
| 		goto leave_reset_head;
 | |
| 	}
 | |
| 
 | |
| 	if (!oid)
 | |
| 		oid = &head_oid;
 | |
| 
 | |
| 	if (refs_only)
 | |
| 		goto reset_head_refs;
 | |
| 
 | |
| 	setup_unpack_trees_porcelain(&unpack_tree_opts, action);
 | |
| 	unpack_tree_opts.head_idx = 1;
 | |
| 	unpack_tree_opts.src_index = r->index;
 | |
| 	unpack_tree_opts.dst_index = r->index;
 | |
| 	unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
 | |
| 	unpack_tree_opts.update = 1;
 | |
| 	unpack_tree_opts.merge = 1;
 | |
| 	init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
 | |
| 	if (!detach_head)
 | |
| 		unpack_tree_opts.reset = 1;
 | |
| 
 | |
| 	if (repo_read_index_unmerged(r) < 0) {
 | |
| 		ret = error(_("could not read index"));
 | |
| 		goto leave_reset_head;
 | |
| 	}
 | |
| 
 | |
| 	if (!reset_hard && !fill_tree_descriptor(r, &desc[nr++], &head_oid)) {
 | |
| 		ret = error(_("failed to find tree of %s"),
 | |
| 			    oid_to_hex(&head_oid));
 | |
| 		goto leave_reset_head;
 | |
| 	}
 | |
| 
 | |
| 	if (!fill_tree_descriptor(r, &desc[nr++], oid)) {
 | |
| 		ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
 | |
| 		goto leave_reset_head;
 | |
| 	}
 | |
| 
 | |
| 	if (unpack_trees(nr, desc, &unpack_tree_opts)) {
 | |
| 		ret = -1;
 | |
| 		goto leave_reset_head;
 | |
| 	}
 | |
| 
 | |
| 	tree = parse_tree_indirect(oid);
 | |
| 	prime_cache_tree(r, r->index, tree);
 | |
| 
 | |
| 	if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0) {
 | |
| 		ret = error(_("could not write index"));
 | |
| 		goto leave_reset_head;
 | |
| 	}
 | |
| 
 | |
| reset_head_refs:
 | |
| 	reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
 | |
| 	strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : default_reflog_action);
 | |
| 	prefix_len = msg.len;
 | |
| 
 | |
| 	if (update_orig_head) {
 | |
| 		if (!get_oid("ORIG_HEAD", &oid_old_orig))
 | |
| 			old_orig = &oid_old_orig;
 | |
| 		if (!get_oid("HEAD", &oid_orig)) {
 | |
| 			orig = &oid_orig;
 | |
| 			if (!reflog_orig_head) {
 | |
| 				strbuf_addstr(&msg, "updating ORIG_HEAD");
 | |
| 				reflog_orig_head = msg.buf;
 | |
| 			}
 | |
| 			update_ref(reflog_orig_head, "ORIG_HEAD", orig,
 | |
| 				   old_orig, 0, UPDATE_REFS_MSG_ON_ERR);
 | |
| 		} else if (old_orig)
 | |
| 			delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
 | |
| 	}
 | |
| 
 | |
| 	if (!reflog_head) {
 | |
| 		strbuf_setlen(&msg, prefix_len);
 | |
| 		strbuf_addstr(&msg, "updating HEAD");
 | |
| 		reflog_head = msg.buf;
 | |
| 	}
 | |
| 	if (!switch_to_branch)
 | |
| 		ret = update_ref(reflog_head, "HEAD", oid, orig,
 | |
| 				 detach_head ? REF_NO_DEREF : 0,
 | |
| 				 UPDATE_REFS_MSG_ON_ERR);
 | |
| 	else {
 | |
| 		ret = update_ref(reflog_head, switch_to_branch, oid,
 | |
| 				 NULL, 0, UPDATE_REFS_MSG_ON_ERR);
 | |
| 		if (!ret)
 | |
| 			ret = create_symref("HEAD", switch_to_branch,
 | |
| 					    reflog_head);
 | |
| 	}
 | |
| 	if (run_hook)
 | |
| 		run_hook_le(NULL, "post-checkout",
 | |
| 			    oid_to_hex(orig ? orig : null_oid()),
 | |
| 			    oid_to_hex(oid), "1", NULL);
 | |
| 
 | |
| leave_reset_head:
 | |
| 	strbuf_release(&msg);
 | |
| 	rollback_lock_file(&lock);
 | |
| 	clear_unpack_trees_porcelain(&unpack_tree_opts);
 | |
| 	while (nr)
 | |
| 		free((void *)desc[--nr].buffer);
 | |
| 	return ret;
 | |
| 
 | |
| }
 |