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

Merge branch 'rs/apply-reject-fd-leakfix'

Browse Source 
A file descriptor leak in an error codepath, used when "git apply
--reject" fails to create the *.rej file, has been corrected.

* rs/apply-reject-fd-leakfix:
  apply: don't leak fd on fdopen() error
This commit is contained in:
Junio C Hamano
2024-04-15 14:11:42 -07:00
parent c7a9ec4728 2b1f456adf
commit ce729ea9ba
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apply.c
View File

@@ -4665,8 +4665,11 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch)
return error_errno(_("cannot open %s"), namebuf); return error_errno(_("cannot open %s"), namebuf);
} }
rej = fdopen(fd, "w"); rej = fdopen(fd, "w");
if (!rej) if (!rej) {
return error_errno(_("cannot open %s"), namebuf); error_errno(_("cannot open %s"), namebuf);
close(fd);
return -1;
}
/* Normal git tools never deal with .rej, so do not pretend /* Normal git tools never deal with .rej, so do not pretend
* this is a git patch by saying --git or giving extended * this is a git patch by saying --git or giving extended