Experimental fix for a memory leak in the resource manager.

research/miniaudio_engine.h

@@ -6361,44 +6361,44 @@ static ma_result ma_resource_manager_data_buffer_uninit_internal(ma_resource_man
     ma_resource_manager_data_buffer_uninit_connector(pDataBuffer->pResourceManager, pDataBuffer);
     pDataBuffer->connectorType = ma_resource_manager_data_buffer_connector_unknown;
 
-    /* Free the node last. */
-    ma_resource_manager_data_buffer_node_free(pDataBuffer->pResourceManager, pDataBuffer->pNode);
-
-    return MA_SUCCESS;
-}
-
-static ma_result ma_resource_manager_data_buffer_uninit_nolock(ma_resource_manager_data_buffer* pDataBuffer)
-{
-    ma_uint32 result;
+    /* With the connector uninitialized we can decrement the ref count of the node and free it if required. */
+    ma_resource_manager_data_buffer_bst_lock(pDataBuffer->pResourceManager);
+    {
+        ma_result result;
         ma_uint32 refCount;
 
-    MA_ASSERT(pDataBuffer != NULL);
-
         result = ma_resource_manager_data_buffer_node_decrement_ref(pDataBuffer->pResourceManager, pDataBuffer->pNode, &refCount);
         if (result != MA_SUCCESS) {
             return result;
         }
 
-    /* If the reference count has hit zero it means we need to delete the data buffer and it's backing data (so long as it's owned by the resource manager). */
         if (refCount == 0) {
-        ma_bool32 asyncUninit = MA_TRUE;
-
             result = ma_resource_manager_data_buffer_node_remove(pDataBuffer->pResourceManager, pDataBuffer->pNode);
             if (result != MA_SUCCESS) {
                 return result;  /* An error occurred when trying to remove the data buffer. This should never happen. */
             }
 
-        if (ma_resource_manager_data_buffer_node_result(pDataBuffer->pNode) == MA_SUCCESS) {
-            asyncUninit = MA_FALSE;
+            /* Mark the node as unavailable just to be safe. */
+            c89atomic_exchange_i32(&pDataBuffer->pNode->result, MA_UNAVAILABLE);
+
+            /* Free the node last. */
+            ma_resource_manager_data_buffer_node_free(pDataBuffer->pResourceManager, pDataBuffer->pNode);
+        }
     }
+    ma_resource_manager_data_buffer_bst_unlock(pDataBuffer->pResourceManager);
 
-        /*
-        The data buffer has been removed from the BST so now we need to delete the underyling data. This needs to be done in a separate thread. We don't
-        want to delete anything if the data is owned by the application. Also, just to be safe, we set the result to MA_UNAVAILABLE.
-        */
-        c89atomic_exchange_i32(&pDataBuffer->pNode->result, MA_UNAVAILABLE);
+    return MA_SUCCESS;
+}
 
-        if (asyncUninit == MA_FALSE) {
+MA_API ma_result ma_resource_manager_data_buffer_uninit(ma_resource_manager_data_buffer* pDataBuffer)
+{
+    ma_result result;
+
+    if (pDataBuffer == NULL) {
+        return MA_INVALID_ARGS;
+    }
+
+    if (ma_resource_manager_data_buffer_node_result(pDataBuffer->pNode) == MA_SUCCESS) {
         /* The data buffer can be deleted synchronously. */
         return ma_resource_manager_data_buffer_uninit_internal(pDataBuffer);
     } else {
@@ -6429,24 +6429,6 @@ static ma_result ma_resource_manager_data_buffer_uninit_nolock(ma_resource_manag
         ma_resource_manager_inline_notification_wait(&notification);
         ma_resource_manager_inline_notification_uninit(&notification);
     }
-    }
-
-    return MA_SUCCESS;
-}
-
-MA_API ma_result ma_resource_manager_data_buffer_uninit(ma_resource_manager_data_buffer* pDataBuffer)
-{
-    ma_result result;
-
-    if (pDataBuffer == NULL) {
-        return MA_INVALID_ARGS;
-    }
-
-    ma_resource_manager_data_buffer_bst_lock(pDataBuffer->pResourceManager);
-    {
-        result = ma_resource_manager_data_buffer_uninit_nolock(pDataBuffer);
-    }
-    ma_resource_manager_data_buffer_bst_unlock(pDataBuffer->pResourceManager);
 
     return result;
 }