 f63b88867a
			
		
	
	f63b88867a
	
	
	
		
			
			shorten_unambiguous_ref() returns an allocated string. We have to
track it separately from the const refname.
This leak has existed since:
9ab55daa55 (git symbolic-ref --delete $symref, 2012-10-21)
This leak was found when running t0001 with LSAN, see also LSAN output
below:
Direct leak of 19 byte(s) in 1 object(s) allocated from:
    #0 0x486514 in strdup /home/abuild/rpmbuild/BUILD/llvm-11.0.0.src/build/../projects/compiler-rt/lib/asan/asan_interceptors.cpp:452:3
    #1 0x9ab048 in xstrdup /home/ahunt/oss-fuzz/git/wrapper.c:29:14
    #2 0x8b452f in refs_shorten_unambiguous_ref /home/ahunt/oss-fuzz/git/refs.c
    #3 0x8b47e8 in shorten_unambiguous_ref /home/ahunt/oss-fuzz/git/refs.c:1287:9
    #4 0x679fce in check_symref /home/ahunt/oss-fuzz/git/builtin/symbolic-ref.c:28:14
    #5 0x679ad8 in cmd_symbolic_ref /home/ahunt/oss-fuzz/git/builtin/symbolic-ref.c:70:9
    #6 0x4cd60d in run_builtin /home/ahunt/oss-fuzz/git/git.c:453:11
    #7 0x4cb2da in handle_builtin /home/ahunt/oss-fuzz/git/git.c:704:3
    #8 0x4ccc37 in run_argv /home/ahunt/oss-fuzz/git/git.c:771:4
    #9 0x4cac29 in cmd_main /home/ahunt/oss-fuzz/git/git.c:902:19
    #10 0x69cc6e in main /home/ahunt/oss-fuzz/git/common-main.c:52:11
    #11 0x7f98388a4349 in __libc_start_main (/lib64/libc.so.6+0x24349)
Signed-off-by: Andrzej Hunt <ajrhunt@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
	
		
			
				
	
	
		
			81 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			81 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "builtin.h"
 | |
| #include "config.h"
 | |
| #include "cache.h"
 | |
| #include "refs.h"
 | |
| #include "parse-options.h"
 | |
| 
 | |
| static const char * const git_symbolic_ref_usage[] = {
 | |
| 	N_("git symbolic-ref [<options>] <name> [<ref>]"),
 | |
| 	N_("git symbolic-ref -d [-q] <name>"),
 | |
| 	NULL
 | |
| };
 | |
| 
 | |
| static int check_symref(const char *HEAD, int quiet, int shorten, int print)
 | |
| {
 | |
| 	int flag;
 | |
| 	const char *refname = resolve_ref_unsafe(HEAD, 0, NULL, &flag);
 | |
| 
 | |
| 	if (!refname)
 | |
| 		die("No such ref: %s", HEAD);
 | |
| 	else if (!(flag & REF_ISSYMREF)) {
 | |
| 		if (!quiet)
 | |
| 			die("ref %s is not a symbolic ref", HEAD);
 | |
| 		else
 | |
| 			return 1;
 | |
| 	}
 | |
| 	if (print) {
 | |
| 		char *to_free = NULL;
 | |
| 		if (shorten)
 | |
| 			refname = to_free = shorten_unambiguous_ref(refname, 0);
 | |
| 		puts(refname);
 | |
| 		free(to_free);
 | |
| 	}
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
 | |
| {
 | |
| 	int quiet = 0, delete = 0, shorten = 0, ret = 0;
 | |
| 	const char *msg = NULL;
 | |
| 	struct option options[] = {
 | |
| 		OPT__QUIET(&quiet,
 | |
| 			N_("suppress error message for non-symbolic (detached) refs")),
 | |
| 		OPT_BOOL('d', "delete", &delete, N_("delete symbolic ref")),
 | |
| 		OPT_BOOL(0, "short", &shorten, N_("shorten ref output")),
 | |
| 		OPT_STRING('m', NULL, &msg, N_("reason"), N_("reason of the update")),
 | |
| 		OPT_END(),
 | |
| 	};
 | |
| 
 | |
| 	git_config(git_default_config, NULL);
 | |
| 	argc = parse_options(argc, argv, prefix, options,
 | |
| 			     git_symbolic_ref_usage, 0);
 | |
| 	if (msg && !*msg)
 | |
| 		die("Refusing to perform update with empty message");
 | |
| 
 | |
| 	if (delete) {
 | |
| 		if (argc != 1)
 | |
| 			usage_with_options(git_symbolic_ref_usage, options);
 | |
| 		ret = check_symref(argv[0], 1, 0, 0);
 | |
| 		if (ret)
 | |
| 			die("Cannot delete %s, not a symbolic ref", argv[0]);
 | |
| 		if (!strcmp(argv[0], "HEAD"))
 | |
| 			die("deleting '%s' is not allowed", argv[0]);
 | |
| 		return delete_ref(NULL, argv[0], NULL, REF_NO_DEREF);
 | |
| 	}
 | |
| 
 | |
| 	switch (argc) {
 | |
| 	case 1:
 | |
| 		ret = check_symref(argv[0], quiet, shorten, 1);
 | |
| 		break;
 | |
| 	case 2:
 | |
| 		if (!strcmp(argv[0], "HEAD") &&
 | |
| 		    !starts_with(argv[1], "refs/"))
 | |
| 			die("Refusing to point HEAD outside of refs/");
 | |
| 		ret = !!create_symref(argv[0], argv[1], msg);
 | |
| 		break;
 | |
| 	default:
 | |
| 		usage_with_options(git_symbolic_ref_usage, options);
 | |
| 	}
 | |
| 	return ret;
 | |
| }
 |