mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/leakfix-mailmap'

Browse Source 
Leakfix.

* jc/leakfix-mailmap:
  mailmap: plug memory leak in read_mailmap_blob()
This commit is contained in:
Junio C Hamano
2024-08-14 14:54:53 -07:00
parent dfaa04f3c6 d98d9c77e5
commit c147b41f4c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mailmap.c
View File

@ -201,8 +201,10 @@ static int read_mailmap_blob(struct string_list *map, const char *name)
buf = repo_read_object_file(the_repository, &oid, &type, &size); buf = repo_read_object_file(the_repository, &oid, &type, &size);
if (!buf) if (!buf)
return error("unable to read mailmap object at %s", name); return error("unable to read mailmap object at %s", name);
if (type != OBJ_BLOB) if (type != OBJ_BLOB) {
free(buf);
return error("mailmap is not a blob: %s", name); return error("mailmap is not a blob: %s", name);
}
read_mailmap_string(map, buf); read_mailmap_string(map, buf);

1
t/t4203-mailmap.sh
View File

@ -5,6 +5,7 @@ test_description='.mailmap configurations'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'setup commits and contacts file' ' test_expect_success 'setup commits and contacts file' '