zsh-workers
 help / color / mirror / code / Atom feed
From: Mikael Magnusson <mikachu@gmail.com>
To: Peter Stephenson <p.stephenson@samsung.com>
Cc: zsh workers <zsh-workers@zsh.org>
Subject: Re: PATCH: Fix use-after-free for print -zf and print -sf
Date: Tue, 10 Feb 2015 12:32:52 +0100	[thread overview]
Message-ID: <CAHYJk3Q3AMx_+TxVKq0mx6jhCEGCxSDPoJ3K1PPm6tAY3nDUww@mail.gmail.com> (raw)
In-Reply-To: <20150210111811.1c851f7f@pwslap01u.europe.root.pri>

On Tue, Feb 10, 2015 at 12:18 PM, Peter Stephenson
<p.stephenson@samsung.com> wrote:
> On Tue, 10 Feb 2015 12:13:12 +0100
> Mikael Magnusson <mikachu@gmail.com> wrote:
>> Oops, actually I think I do need it, since I want fout being NULL to
>> short circuit the whole if statement to false, and currently it's
>> interpreted as if ((fout && (fout != stdout)) ? .. : ..), resulting in
>> a call to fflush(NULL) which flushes all open output buffers. I should
>> probably have quoted both lines of the if. :)
>
> Yes, I missed that... that's kind of why I talked about rewriting it...
>
> pws

-    /* Testing EBADF special-cases >&- redirections */
-    if (fout && ((fout != stdout) ? (fclose(fout) != 0) :
-       (fflush(fout) != 0 && errno != EBADF))) {
-       zwarnnam(name, "write error: %e", errno);
-       ret = 1;
-    }
+#ifdef HAVE_OPEN_MEMSTREAM
+    if (fout)
+#endif
+       /* Testing EBADF special-cases >&- redirections */
+       if ((fout != stdout) ? (fclose(fout) != 0) :
+           (fflush(fout) != 0 && errno != EBADF)) {
+           zwarnnam(name, "write error: %e", errno);
+           ret = 1;
+       }
     return ret;
 }

This would make it very clear that fout can only be NULL in one very
particular case, and also leaves the main EBADF thing the same as the
other places in the function... (sorry for bikeshedding so much over
this). Which of these do you prefer?

-- 
Mikael Magnusson


  reply	other threads:[~2015-02-10 11:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-10  7:12 Mikael Magnusson
2015-02-10  7:16 ` Mikael Magnusson
2015-02-10  9:37   ` Peter Stephenson
2015-02-10 11:13     ` Mikael Magnusson
2015-02-10 11:18       ` Peter Stephenson
2015-02-10 11:32         ` Mikael Magnusson [this message]
2015-02-10 11:38           ` Peter Stephenson

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAHYJk3Q3AMx_+TxVKq0mx6jhCEGCxSDPoJ3K1PPm6tAY3nDUww@mail.gmail.com \
    --to=mikachu@gmail.com \
    --cc=p.stephenson@samsung.com \
    --cc=zsh-workers@zsh.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://git.vuxu.org/mirror/zsh/

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 NNTP newsgroup(s).