mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 07:36:09 +02:00
Code

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

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-09 14:42:26 -07:00
parent 3270d194fd 2b1f456adf
commit 11efa0543c
1 changed files with 5 additions and 2 deletions
Show Stats 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);
}
rej = fdopen(fd, "w");
if (!rej)
return error_errno(_("cannot open %s"), namebuf);
if (!rej) {
error_errno(_("cannot open %s"), namebuf);
close(fd);
return -1;
}
/* Normal git tools never deal with .rej, so do not pretend
* this is a git patch by saying --git or giving extended