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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Feb 16, 2017 at 16:31 UTC 0838cbc22fc9567ede7a60e800d876e733820060
1 file changed +2 -6
tempfile.c
+2 -6
@@ -247,12 +247,8 @@ int close_tempfile(struct tempfile *tempfile)
247 tempfile->fd = -1;
248 if (fp) {
249 tempfile->fp = NULL;
250 -
251 - /*
252 - * Note: no short-circuiting here; we want to fclose()
253 - * in any case!
254 - */
255 - err = ferror(fp) | fclose(fp);
250 + err = ferror(fp);
251 + err |= fclose(fp);
252 } else {
253 err = close(fd);
254 }