From: Jeff King <peff@peff.net>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: "Michael Haggerty" <mhagger@alum.mit.edu>,
"Junio C Hamano" <gitster@pobox.com>,
"Jáchym Barvínek" <jachymb@gmail.com>,
git@vger.kernel.org
Subject: [PATCH] tempfile: avoid "ferror | fclose" trick
Date: Thu, 16 Feb 2017 16:31:40 -0500 [thread overview]
Message-ID: <20170216213140.xqw7gzjimhvg7tcm@sigill.intra.peff.net> (raw)
In-Reply-To: <20170216164359.k2ab7laqqvusfsm2@sigill.intra.peff.net>
On Thu, Feb 16, 2017 at 11:43:59AM -0500, Jeff King wrote:
> On Thu, Feb 16, 2017 at 11:10:18AM +0100, Andreas Schwab wrote:
>
> > >> int xfclose(FILE *fp)
> > >> {
> > >> return ferror(fp) | fclose(fp);
> > >> }
> > >
> > > Yes, that's exactly what I had in mind (might be worth calling out the
> > > bitwise-OR, though, just to make it clear it's not a typo).
> >
> > Since the order of evaluation is unspecified, it would be better to
> > force sequencing ferror before fclose.
>
> Good point. Arguably the call in tempfile.c is buggy.
Here's a fix.
I think close_tempfile() suffers from the same errno problem discussed
earlier in this thread (i.e., that after calling it, you may get an
error return with a random, unrelated errno value if ferror() failed but
fclose() did not).
-- >8 --
Subject: [PATCH] tempfile: avoid "ferror | fclose" trick
The current code wants to record an error condition from
either ferror() or fclose(), but makes sure that we always
call both functions. So it can't use logical-OR "||", which
would short-circuit when ferror() is true. Instead, it uses
bitwise-OR "|" to evaluate both functions and set one or
more bits in the "err" flag if they reported a failure.
Unlike logical-OR, though, bitwise-OR does not introduce a
sequence point, and the order of evaluation for its operands
is unspecified. So a compiler would be free to generate code
which calls fclose() first, and then ferror() on the
now-freed filehandle.
There's no indication that this has happened in practice,
but let's write it out in a way that follows the standard.
Noticed-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Jeff King <peff@peff.net>
---
tempfile.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/tempfile.c b/tempfile.c
index 2990c9242..ffcc27237 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -247,12 +247,8 @@ int close_tempfile(struct tempfile *tempfile)
tempfile->fd = -1;
if (fp) {
tempfile->fp = NULL;
-
- /*
- * Note: no short-circuiting here; we want to fclose()
- * in any case!
- */
- err = ferror(fp) | fclose(fp);
+ err = ferror(fp);
+ err |= fclose(fp);
} else {
err = close(fd);
}
--
2.12.0.rc1.559.gd292418bf
next prev parent reply other threads:[~2017-02-16 21:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-12 16:37 Confusing git messages when disk is full Jáchym Barvínek
2017-02-15 21:32 ` Jeff King
2017-02-15 21:47 ` Junio C Hamano
2017-02-15 21:51 ` Jeff King
2017-02-15 22:28 ` Junio C Hamano
2017-02-15 22:32 ` Jeff King
2017-02-15 22:50 ` Junio C Hamano
2017-02-15 23:18 ` Jeff King
2017-02-16 10:10 ` Andreas Schwab
2017-02-16 16:44 ` Jeff King
2017-02-16 21:31 ` Jeff King [this message]
2017-02-17 8:00 ` [PATCH] tempfile: avoid "ferror | fclose" trick Michael Haggerty
2017-02-17 8:07 ` Jeff King
2017-02-17 10:42 ` Michael Haggerty
2017-02-17 20:54 ` Jeff King
2017-02-17 21:07 ` Jeff King
2017-02-17 21:17 ` Junio C Hamano
2017-02-17 21:21 ` Jeff King
2017-02-17 21:42 ` Junio C Hamano
2017-02-17 22:10 ` Jeff King
2017-02-17 22:40 ` Junio C Hamano
2017-02-17 23:39 ` Jeff King
2017-02-17 23:52 ` Junio C Hamano
2017-02-17 23:54 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170216213140.xqw7gzjimhvg7tcm@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jachymb@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).