Changeset 86412 in vbox for trunk/src/VBox/Runtime/r3/os2

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/os2/pipe-os2.cpp (modified) (6 diffs)

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

@@ -68 +68 @@
     /** Set if this is the read end, clear if it's the write end. */
     bool                fRead;
+    /** RTPipeFromNative: Leave open. */
+    bool                fLeaveOpen;
     /** Whether the pipe is in blocking or non-blocking mode. */
     bool                fBlocking;
@@ -195 +197 @@
                     pThisR->fRead           = true;
                     pThisW->fRead           = false;
+                    pThisR->fLeaveOpen      = false;
+                    pThisW->fLeaveOpen      = false;
                     pThisR->fBlocking       = false;
                     pThisW->fBlocking       = true;
@@ -227 +231 @@
 
 
-RTDECL(int)  RTPipeClose(RTPIPE hPipe)
+RTDECL(int)  RTPipeCloseEx(RTPIPE hPipe, bool fLeaveOpen)
 {
     RTPIPEINTERNAL *pThis = hPipe;
@@ -243 +247 @@
 
     /* Don't call DosDisConnectNPipe! */
-    DosClose(pThis->hPipe);
+    if (!fLeaveOpen && !pThis->fLeaveOpen)
+        DosClose(pThis->hPipe);
     pThis->hPipe = (HPIPE)-1;
 
@@ -261 +266 @@
 
 
+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);
 
@@ -333 +344 @@
         pThis->hPipe           = hNative;
         pThis->hev             = NULLHANDLE;
-        pThis->fRead           = !!(fFlags & RTPIPE_N_READ);
+        pThis->fRead           = RT_BOOL(fFlags & RTPIPE_N_READ);
+        pThis->fLeaveOpen      = RT_BOOL(fFlags & RTPIPE_N_LEAVE_OPEN);
         pThis->fBlocking       = !(fPipeState & NP_NOWAIT);
         //pThis->fBrokenPipe     = false;