kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: future-proof update_file_flags() against memory leaks 

There is a 'free_buf' label to which all but one of the error paths in
update_file_flags() jump; that error case involves a NULL buf and is
thus not a memory leak.  However, make that error case execute the same
deallocation code anyway so that if anyone adds any additional memory
allocations or deallocations, then all error paths correctly deallocate
resources.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2019-08-17 11:41:26 -07:00 committed by Junio C Hamano
parent 8e01251694
commit f836bf3937
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
merge-recursive.c
View File

@ -934,9 +934,11 @@ static int update_file_flags(struct merge_options *opt,
}

buf = read_object_file(&contents->oid, &type, &size);
if (!buf)
return err(opt, _("cannot read object %s '%s'"),
oid_to_hex(&contents->oid), path);
if (!buf) {
ret = err(opt, _("cannot read object %s '%s'"),
oid_to_hex(&contents->oid), path);
goto free_buf;
}
if (type != OBJ_BLOB) {
ret = err(opt, _("blob expected for %s '%s'"),
oid_to_hex(&contents->oid), path);