| Message ID | 5ba55ee4-94c7-4094-a744-584fc623b391@web.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | apply: don't leak fd on fdopen() error | expand |
René Scharfe <l.s.r@web.de> writes: > Signed-off-by: René Scharfe <l.s.r@web.de> > --- > apply.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/apply.c b/apply.c > index 432837a674..1cfbc2f074 100644 > --- a/apply.c > +++ b/apply.c > @@ -4655,8 +4655,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; > + } Ah, true, this fd is what we created in this function, and we should close it. Well spotted. Will queue. > > /* Normal git tools never deal with .rej, so do not pretend > * this is a git patch by saying --git or giving extended > -- > 2.44.0
diff --git a/apply.c b/apply.c index 432837a674..1cfbc2f074 100644 --- a/apply.c +++ b/apply.c @@ -4655,8 +4655,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
Signed-off-by: René Scharfe <l.s.r@web.de> --- apply.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.44.0