undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests 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
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; int nongit = 0;
unsigned flags = HASH_FORMAT_CHECK; unsigned flags = HASH_FORMAT_CHECK;
const char *vpath = NULL; const char *vpath = NULL;
char *vpath_free = NULL;
const struct option hash_object_options[] = { const struct option hash_object_options[] = {
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")), OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
OPT_BIT('w', NULL, &flags, N_("write the object into the object database"), 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 else
prefix = setup_git_directory_gently(&nongit); prefix = setup_git_directory_gently(&nongit);
if (vpath && prefix) if (vpath && prefix) {
vpath = prefix_filename(prefix, vpath); vpath_free = prefix_filename(prefix, vpath);
vpath = vpath_free;
}
git_config(git_default_config, NULL); 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) if (stdin_paths)
hash_stdin_paths(type, no_filters, flags, literally); hash_stdin_paths(type, no_filters, flags, literally);
free(vpath_free);
return 0; return 0;
} }

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

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