Changeset 54965 in vbox for trunk/src/VBox

Timestamp:

Mar 26, 2015 12:15:52 PM (10 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Fix crash if creating a async completion manager failed

File:

• trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp

@@ -1050 +1050 @@
                     /* Simple mode. Every file has its own async I/O manager. */
                     rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr, PDMACEPFILEMGRTYPE_SIMPLE);
-                    AssertRC(rc);
                 }
                 else
@@ -1065 +1064 @@
 
                     if (!pAioMgr)
+                        rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr, enmMgrType);
+                }
+
+                if (RT_SUCCESS(rc))
+                {
+                    pEpFile->AioMgr.pTreeRangesLocked = (PAVLRFOFFTREE)RTMemAllocZ(sizeof(AVLRFOFFTREE));
+                    if (!pEpFile->AioMgr.pTreeRangesLocked)
+                        rc = VERR_NO_MEMORY;
+                    else
                     {
-                        rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr, enmMgrType);
-                        AssertRC(rc);
-                    }
-                }
-
-                pEpFile->AioMgr.pTreeRangesLocked = (PAVLRFOFFTREE)RTMemAllocZ(sizeof(AVLRFOFFTREE));
-                if (!pEpFile->AioMgr.pTreeRangesLocked)
-                    rc = VERR_NO_MEMORY;
-                else
-                {
-                    pEpFile->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE;
-
-                    /* Assign the endpoint to the thread. */
-                    rc = pdmacFileAioMgrAddEndpoint(pAioMgr, pEpFile);
-                    if (RT_FAILURE(rc))
-                    {
-                        RTMemFree(pEpFile->AioMgr.pTreeRangesLocked);
-                        MMR3HeapFree(pEpFile->pTasksFreeHead);
+                        pEpFile->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE;
+
+                        /* Assign the endpoint to the thread. */
+                        rc = pdmacFileAioMgrAddEndpoint(pAioMgr, pEpFile);
+                        if (RT_FAILURE(rc))
+                        {
+                            RTMemFree(pEpFile->AioMgr.pTreeRangesLocked);
+                            MMR3HeapFree(pEpFile->pTasksFreeHead);
+                        }
                     }
                 }