From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id 607F03857800; Tue, 14 Sep 2021 15:06:04 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 607F03857800
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: pipes: use NtClose when file has been opened
 with an NtXxx function
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: b12cf6b3cf1557a73b899f8064389966e52d5949
X-Git-Newrev: 8efcee2500016a163b82bee94c542531676fc96b
Message-Id: <20210914150604.607F03857800@sourceware.org>
Date: Tue, 14 Sep 2021 15:06:04 +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: Tue, 14 Sep 2021 15:06:04 -0000

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

commit 8efcee2500016a163b82bee94c542531676fc96b
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Fri Sep 3 10:31:27 2021 +0200

    Cygwin: pipes: use NtClose when file has been opened with an NtXxx function
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

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

diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 14f28f02c..8b66121b4 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -602,14 +602,14 @@ fhandler_pipe::create (fhandler_pipe *fhs[2], unsigned psize, int mode)
     __seterrno_from_win_error (ret);
   else if ((fhs[0] = (fhandler_pipe *) build_fh_dev (*piper_dev)) == NULL)
     {
-      CloseHandle (r);
-      CloseHandle (w);
+      NtClose (r);
+      NtClose (w);
     }
   else if ((fhs[1] = (fhandler_pipe *) build_fh_dev (*pipew_dev)) == NULL)
     {
       delete fhs[0];
-      CloseHandle (r);
-      CloseHandle (w);
+      NtClose (r);
+      NtClose (w);
     }
   else
     {
@@ -745,7 +745,7 @@ nt_create (LPSECURITY_ATTRIBUTES sa_ptr, PHANDLE r, PHANDLE w,
 	  DWORD err = GetLastError ();
 	  debug_printf ("NtOpenFile failed, r %p, %E", r);
 	  if (r)
-	    CloseHandle (*r);
+	    NtClose (*r);
 	  *w = NULL;
 	  return err;
 	}