Changeset 86412 in vbox for trunk/src/VBox/Runtime/r3/win/pipe-win.cpp

Timestamp:

Oct 2, 2020 11:39:26 AM (4 years ago)

Author:

vboxsync

Message:

IPRT/pipe: Adding RTPipeCloseEx w/ a fLeaveOpen parameter so we can prevent leaks via RTHandleGetStandard. Adding RTPIPE_N_LEAVE_OPEN to RTPipeFromNative. bugref:9841

File:

• trunk/src/VBox/Runtime/r3/win/pipe-win.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/r3/win/pipe-win.cpp

@@ -67 +67 @@
     /** Set if this is the read end, clear if it's the write end. */
     bool                fRead;
+    /** RTPipeFromNative: Leave native handle open on RTPipeClose. */
+    bool                fLeaveOpen;
     /** Set if there is already pending I/O. */
     bool                fIOPending;
@@ -284 +286 @@
                             pThisR->fRead               = true;
                             pThisW->fRead               = false;
+                            pThisR->fLeaveOpen          = false;
+                            pThisW->fLeaveOpen          = false;
                             //pThisR->fIOPending        = false;
                             //pThisW->fIOPending        = false;
@@ -400 +404 @@
 
 
-RTDECL(int)  RTPipeClose(RTPIPE hPipe)
+RTDECL(int)  RTPipeCloseEx(RTPIPE hPipe, bool fLeaveOpen)
 {
     RTPIPEINTERNAL *pThis = hPipe;
@@ -418 +422 @@
         rtPipeWriteCheckCompletion(pThis);
 
-    CloseHandle(pThis->hPipe);
+    if (!fLeaveOpen && !pThis->fLeaveOpen)
+        CloseHandle(pThis->hPipe);
     pThis->hPipe = INVALID_HANDLE_VALUE;
 
@@ -436 +441 @@
 
 
+RTDECL(int)  RTPipeClose(RTPIPE hPipe)
+{
+    return RTPipeCloseEx(hPipe, false /*fLeaveOpen*/);
+}
+
+
 RTDECL(int)  RTPipeFromNative(PRTPIPE phPipe, RTHCINTPTR hNativePipe, uint32_t fFlags)
 {
     AssertPtrReturn(phPipe, VERR_INVALID_POINTER);
-    AssertReturn(!(fFlags & ~RTPIPE_N_VALID_MASK), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTPIPE_N_VALID_MASK_FN), VERR_INVALID_PARAMETER);
     AssertReturn(!!(fFlags & RTPIPE_N_READ) != !!(fFlags & RTPIPE_N_WRITE), VERR_INVALID_PARAMETER);
 
@@ -482 +493 @@
             pThis->u32Magic             = RTPIPE_MAGIC;
             pThis->hPipe                = hNative;
-            pThis->fRead                = !!(fFlags & RTPIPE_N_READ);
+            pThis->fRead                = RT_BOOL(fFlags & RTPIPE_N_READ);
+            pThis->fLeaveOpen           = RT_BOOL(fFlags & RTPIPE_N_LEAVE_OPEN);
             //pThis->fIOPending         = false;
             //pThis->fZeroByteRead      = false;
@@ -510 +522 @@
                     pThis->hPipe = hNative2;
                     if (rtPipeQueryNtInfo(pThis, &Info))
+                    {
+                        pThis->fLeaveOpen = false;
                         rc = VINF_SUCCESS;
+                    }
                     else
                     {
@@ -552 +567 @@
                     if (hNative2 != INVALID_HANDLE_VALUE)
                     {
-                        if (   hNative != GetStdHandle(STD_INPUT_HANDLE)
+                        if (   !(fFlags & RTPIPE_N_LEAVE_OPEN)
+                            && hNative != GetStdHandle(STD_INPUT_HANDLE)
                             && hNative != GetStdHandle(STD_OUTPUT_HANDLE)
-                            && hNative != GetStdHandle(STD_ERROR_HANDLE))
+                            && hNative != GetStdHandle(STD_ERROR_HANDLE) )
                             CloseHandle(hNative);
                     }