development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ab/hash-object-leakfix'

Browse source 
Trivial leakfix.

* ab/hash-object-leakfix:
  hash-object: fix a trivial leak in --path
This commit is contained in:
Junio C Hamano 2022-02-18 13:53:29 -08:00
parent 5cc9522b15 d17294a05e
commit 09320a8af1
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
builtin/hash-object.c
View file

@ -92,6 +92,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
int nongit = 0;
unsigned flags = HASH_FORMAT_CHECK;
const char *vpath = NULL;
char *vpath_free = NULL;
const struct option hash_object_options[] = {
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
OPT_BIT('w', NULL, &flags, N_("write the object into the object database"),
@ -114,8 +115,10 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
else
prefix = setup_git_directory_gently(&nongit);
if (vpath && prefix)
vpath = prefix_filename(prefix, vpath);
if (vpath && prefix) {
vpath_free = prefix_filename(prefix, vpath);
vpath = vpath_free;
}
git_config(git_default_config, NULL);
@ -156,5 +159,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
if (stdin_paths)
hash_stdin_paths(type, no_filters, flags, literally);
free(vpath_free);
return 0;
}

1
t/t1007-hash-object.sh
View file

@ -2,6 +2,7 @@
test_description="git hash-object"
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
echo_without_newline() {