From 9d00b583c3d622c5ab8fcbdc3ba089eef8dd9ce5 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Wed, 15 Sep 2021 12:56:34 -0400 Subject: [PATCH 2/2] Cygwin: select: check for negative return from pipe_data_available Make sure except_ready is set (if except_selected) on a negative return from pipe_data_available. --- winsup/cygwin/select.cc | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index cdb213a42..cf9fbbbd3 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -753,8 +753,11 @@ out: gotone += s->except_ready = true; return gotone; } - gotone += s->write_ready = pipe_data_available (s->fd, fh, h, true); - select_printf ("write: %s, gotone %d", fh->get_name (), gotone); + int n = pipe_data_available (s->fd, fh, h, true); + select_printf ("write: %s, n %d", fh->get_name (), n); + gotone += s->write_ready = n; + if (n < 0 && s->except_selected) + gotone += s->except_ready = true; } return gotone; } @@ -953,9 +956,11 @@ peek_fifo (select_record *s, bool from_select) out: if (s->write_selected) { - gotone += s->write_ready - = pipe_data_available (s->fd, fh, fh->get_handle (), true); - select_printf ("write: %s, gotone %d", fh->get_name (), gotone); + int n = pipe_data_available (s->fd, fh, fh->get_handle (), true); + select_printf ("write: %s, n %d", fh->get_name (), n); + gotone += s->write_ready = n; + if (n < 0 && s->except_selected) + gotone += s->except_ready = true; } return gotone; } @@ -1394,8 +1399,11 @@ out: HANDLE h = ptys->get_output_handle (); if (s->write_selected) { - gotone += s->write_ready = pipe_data_available (s->fd, fh, h, true); - select_printf ("write: %s, gotone %d", fh->get_name (), gotone); + int n = pipe_data_available (s->fd, fh, h, true); + select_printf ("write: %s, n %d", fh->get_name (), n); + gotone += s->write_ready = n; + if (n < 0 && s->except_selected) + gotone += s->except_ready = true; } return gotone; } -- 2.33.0