From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <kbrown@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2210)
 id B33F73857C7B; Wed, 24 Nov 2021 14:03:35 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B33F73857C7B
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Ken Brown <kbrown@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: fhandler_pipe::raw_read: fix handle leak
X-Act-Checkin: newlib-cygwin
X-Git-Author: Ken Brown <kbrown@cornell.edu>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: e84b43ea9301d82358bc9a9b8fe19534305074bb
X-Git-Newrev: 6d34b62cb8e192071e193516c23419854c3b4127
Message-Id: <20211124140335.B33F73857C7B@sourceware.org>
Date: Wed, 24 Nov 2021 14:03:35 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Wed, 24 Nov 2021 14:03:35 -0000

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

commit 6d34b62cb8e192071e193516c23419854c3b4127
Author: Ken Brown <kbrown@cornell.edu>
Date:   Tue Nov 23 10:13:43 2021 -0500

    Cygwin: fhandler_pipe::raw_read: fix handle leak
    
    Slightly rearrange the code to avoid returning without closing the
    event handle.

Diff:
---
 winsup/cygwin/fhandler_pipe.cc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 3cbd434b7..5195b2807 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -284,13 +284,6 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
   if (!len)
     return;
 
-  if (!(evt = CreateEvent (NULL, false, false, NULL)))
-    {
-      __seterrno ();
-      len = (size_t) -1;
-      return;
-    }
-
   DWORD timeout = is_nonblocking () ? 0 : INFINITE;
   DWORD waitret = cygwait (read_mtx, timeout);
   switch (waitret)
@@ -314,6 +307,15 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
       len = (size_t) -1;
       return;
     }
+
+  if (!(evt = CreateEvent (NULL, false, false, NULL)))
+    {
+      __seterrno ();
+      len = (size_t) -1;
+      ReleaseMutex (read_mtx);
+      return;
+    }
+
   while (nbytes < len)
     {
       ULONG_PTR nbytes_now = 0;