Changeset 55186 in vbox

Timestamp:

Apr 10, 2015 3:26:11 PM (10 years ago)

Author:

vboxsync

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

99492

Message:

PDMBlkCache: Fix error propagation under certain circumstances

File:

• trunk/src/VBox/VMM/VMMR3/PDMBlkCache.cpp (modified) (4 diffs)

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

@@ -1914 +1914 @@
         if (fCallHandler)
             pdmBlkCacheReqComplete(pBlkCache, pReq);
-        else
-            RTMemFree(pReq);
         return true;
     }
@@ -2133 +2131 @@
     if (!pdmBlkCacheReqUpdate(pBlkCache, pReq, rc, false))
         rc = VINF_AIO_TASK_PENDING;
+    else
+    {
+        rc = pReq->rcReq;
+        RTMemFree(pReq);
+    }
 
     LogFlowFunc((": Leave rc=%Rrc\n", rc));
@@ -2361 +2364 @@
     if (!pdmBlkCacheReqUpdate(pBlkCache, pReq, rc, false))
         rc = VINF_AIO_TASK_PENDING;
+    else
+    {
+        rc = pReq->rcReq;
+        RTMemFree(pReq);
+    }
 
     LogFlowFunc((": Leave rc=%Rrc\n", rc));
@@ -2537 +2545 @@
     if (!pdmBlkCacheReqUpdate(pBlkCache, pReq, rc, false))
         rc = VINF_AIO_TASK_PENDING;
+    else
+    {
+        rc = pReq->rcReq;
+        RTMemFree(pReq);
+    }
 
     LogFlowFunc((": Leave rc=%Rrc\n", rc));