Skip to content

Commit ce729ea

Browse files
committed
Merge branch 'rs/apply-reject-fd-leakfix'
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
2 parents c7a9ec4 + 2b1f456 commit ce729ea

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

apply.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4665,8 +4665,11 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch)
46654665
return error_errno(_("cannot open %s"), namebuf);
46664666
}
46674667
rej = fdopen(fd, "w");
4668-
if (!rej)
4669-
return error_errno(_("cannot open %s"), namebuf);
4668+
if (!rej) {
4669+
error_errno(_("cannot open %s"), namebuf);
4670+
close(fd);
4671+
return -1;
4672+
}
46704673

46714674
/* Normal git tools never deal with .rej, so do not pretend
46724675
* this is a git patch by saying --git or giving extended

0 commit comments

Comments
 (0)