public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: pipe: Fix handling of EPIPE and SIGPIPE in raw_write().
Date: Tue, 14 Sep 2021 15:08:20 +0000 (GMT)	[thread overview]
Message-ID: <20210914150820.253443857404@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a217fa98fda80a7b706e93b6a55a0a8b26f2d586

commit a217fa98fda80a7b706e93b6a55a0a8b26f2d586
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Tue Sep 14 20:59:08 2021 +0900

    Cygwin: pipe: Fix handling of EPIPE and SIGPIPE in raw_write().

Diff:
---
 winsup/cygwin/fhandler_pipe.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 7e5ab328c..c2f4353f6 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -407,6 +407,13 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
   if (!len)
     return 0;
 
+  if (reader_closed ())
+    {
+      set_errno (EPIPE);
+      raise (SIGPIPE);
+      return -1;
+    }
+
   if (len <= pipe_buf_size)
     chunk = len;
   else if (is_nonblocking ())
@@ -475,7 +482,7 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
 		  CancelIo (get_handle ());
 		  set_errno (EPIPE);
 		  raise (SIGPIPE);
-		  break;
+		  goto out;
 		}
 	      else
 		cygwait (select_sem, 10);
@@ -527,6 +534,7 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
       if (nbytes_now == 0)
 	break;
     }
+out:
   if (evt)
     CloseHandle (evt);
   if (status == STATUS_THREAD_SIGNALED && nbytes == 0)


                 reply	other threads:[~2021-09-14 15:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20210914150820.253443857404@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.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. 
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).