Changeset 107720 in vbox

Timestamp:

Jan 13, 2025 6:52:47 PM (2 months ago)

Author:

vboxsync

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

166820

Message:

Audio/DrvAudio.cpp: Added some more sanity checks. bugref:10801

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -1490 +1490 @@
      * Release our stream reference.
      */
-    uint32_t cRefs = drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
+    uint32_t const cRefs = drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
     LogFlowFunc(("returns (fDestroyed=%d, cRefs=%u)\n", fDestroyed, cRefs)); RT_NOREF(cRefs);
 }
@@ -2120 +2120 @@
  * @param   pStreamEx       The stream to reference.
  * @param   fMayDestroy     Whether the caller is allowed to implicitly destroy
- *                          the stream or not.
+ *                          the stream or not.  The reference count must _not_
+ *                          reach zero if this is false!
  */
 static uint32_t drvAudioStreamReleaseInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx, bool fMayDestroy)
@@ -2156 +2157 @@
 
             drvAudioStreamFree(pStreamEx);
+            pStreamEx = NULL;
         }
         else
@@ -2169 +2171 @@
     }
 
-    Log12Func(("returns %u (%s)\n", cRefs, cRefs > 0 ? pStreamEx->Core.Cfg.szName : "destroyed"));
+    Log12Func(("returns %u (%s)\n", cRefs, cRefs > 0 ? pStreamEx->Core.Cfg.szName : "destroyed")); /* Not 101% safe, but it's logging. */
     return cRefs;
 }
@@ -2262 +2264 @@
                     LogFlowFunc(("Successfully cancelled pending pfnStreamInitAsync call (hReqInitAsync=%p).\n",
                                  pStreamEx->hReqInitAsync));
-                    drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
+                    uint32_t const cRefs = drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
+                    AssertStmt(cRefs > 0, pStreamEx = NULL);
                 }
                 else
@@ -2274 +2277 @@
                 RTCritSectLeave(&pStreamEx->Core.CritSect);
 
-            /*
-             * Now, if the backend requests asynchronous disabling and destruction
-             * push the disabling and destroying over to a worker thread.
-             *
-             * This is a general offloading feature that all backends should make use of,
-             * however it's rather precarious on macs where stopping an already draining
-             * stream may take 8-10ms which naturally isn't something we should be doing
-             * on an EMT.
-             */
-            if (!(pThis->BackendCfg.fFlags & PDMAUDIOBACKEND_F_ASYNC_STREAM_DESTROY))
-                drvAudioStreamDestroyAsync(pThis, pStreamEx, fImmediate);
-            else
+            if (RT_LIKELY(pStreamEx != NULL)) /* paranoia^2 */
             {
-                int rc2 = RTReqPoolCallEx(pThis->hReqPool, 0 /*cMillies*/, NULL /*phReq*/,
-                                          RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                                          (PFNRT)drvAudioStreamDestroyAsync, 3, pThis, pStreamEx, fImmediate);
-                LogFlowFunc(("hReqInitAsync=%p rc2=%Rrc\n", pStreamEx->hReqInitAsync, rc2));
-                AssertRCStmt(rc2, drvAudioStreamDestroyAsync(pThis, pStreamEx, fImmediate));
+                /*
+                 * Now, if the backend requests asynchronous disabling and destruction
+                 * push the disabling and destroying over to a worker thread.
+                 *
+                 * This is a general offloading feature that all backends should make use of,
+                 * however it's rather precarious on macs where stopping an already draining
+                 * stream may take 8-10ms which naturally isn't something we should be doing
+                 * on an EMT.
+                 */
+                if (!(pThis->BackendCfg.fFlags & PDMAUDIOBACKEND_F_ASYNC_STREAM_DESTROY))
+                    drvAudioStreamDestroyAsync(pThis, pStreamEx, fImmediate);
+                else
+                {
+                    int rc2 = RTReqPoolCallEx(pThis->hReqPool, 0 /*cMillies*/, NULL /*phReq*/,
+                                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                                              (PFNRT)drvAudioStreamDestroyAsync, 3, pThis, pStreamEx, fImmediate);
+                    LogFlowFunc(("hReqInitAsync=%p rc2=%Rrc\n", pStreamEx->hReqInitAsync, rc2));
+                    AssertRCStmt(rc2, drvAudioStreamDestroyAsync(pThis, pStreamEx, fImmediate));
+                }
             }
         }
@@ -3950 +3956 @@
     pIHostDrvAudio->pfnDoOnWorkerThread(pIHostDrvAudio, pStreamEx->pBackend, uUser, pvUser);
 
-    drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
-    LogFlowFunc(("returns\n"));
+    uint32_t const cRefs = drvAudioStreamReleaseInternal(pThis, pStreamEx, true /*fMayDestroy*/);
+    LogFlowFunc(("returns (cRefs=%u)\n", cRefs)); RT_NOREF(cRefs);
 }