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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140713

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

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

@@ -70 +70 @@
     /** Set if this is the read end, clear if it's the write end. */
     bool                fRead;
+    /** RTPipeFromNative: Leave it open on RTPipeClose. */
+    bool                fLeaveOpen;
     /** Atomically operated state variable.
      *
@@ -181 +183 @@
             if (pThisW)
             {
-                pThisR->u32Magic = RTPIPE_MAGIC;
-                pThisW->u32Magic = RTPIPE_MAGIC;
-                pThisR->fd       = aFds[0];
-                pThisW->fd       = aFds[1];
-                pThisR->fRead    = true;
-                pThisW->fRead    = false;
-                pThisR->u32State = RTPIPE_POSIX_BLOCKING;
-                pThisW->u32State = RTPIPE_POSIX_BLOCKING;
+                pThisR->u32Magic    = RTPIPE_MAGIC;
+                pThisW->u32Magic    = RTPIPE_MAGIC;
+                pThisR->fd          = aFds[0];
+                pThisW->fd          = aFds[1];
+                pThisR->fRead       = true;
+                pThisW->fRead       = false;
+                pThisR->fLeaveOpen  = false;
+                pThisW->fLeaveOpen  = false;
+                pThisR->u32State    = RTPIPE_POSIX_BLOCKING;
+                pThisW->u32State    = RTPIPE_POSIX_BLOCKING;
 
                 *phPipeRead  = pThisR;
@@ -213 +217 @@
 
 
-RTDECL(int)  RTPipeClose(RTPIPE hPipe)
+RTDECL(int)  RTPipeCloseEx(RTPIPE hPipe, bool fLeaveOpen)
 {
     RTPIPEINTERNAL *pThis = hPipe;
@@ -228 +232 @@
     int fd = pThis->fd;
     pThis->fd = -1;
-    close(fd);
+    if (!fLeaveOpen && !pThis->fLeaveOpen)
+        close(fd);
 
     if (ASMAtomicReadU32(&pThis->u32State) & RTPIPE_POSIX_USERS_MASK)
@@ -241 +246 @@
 }
 
+
+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);
 
@@ -268 +280 @@
         return VERR_NO_MEMORY;
 
-    pThis->u32Magic = RTPIPE_MAGIC;
-    pThis->fd       = hNative;
-    pThis->fRead    = !!(fFlags & RTPIPE_N_READ);
-    pThis->u32State = fFd & O_NONBLOCK ? 0 : RTPIPE_POSIX_BLOCKING;
+    pThis->u32Magic   = RTPIPE_MAGIC;
+    pThis->fd         = hNative;
+    pThis->fRead      = RT_BOOL(fFlags & RTPIPE_N_READ);
+    pThis->fLeaveOpen = RT_BOOL(fFlags & RTPIPE_N_LEAVE_OPEN);
+    pThis->u32State   = fFd & O_NONBLOCK ? 0 : RTPIPE_POSIX_BLOCKING;
 
     /*