Changeset 36136 in vbox

Timestamp:

Mar 3, 2011 9:20:28 AM (14 years ago)

Author:

vboxsync

Message:

Storage: Fix read from wrong snapshots. Happens only with formats which need to read metadata from the disk and for disks with more than 1 snapshot

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -1315 +1315 @@
         if (rc == VERR_VD_BLOCK_FREE)
         {
-            for (pCurrImage =  pCurrImage->pPrev;
-                 pCurrImage != NULL && rc == VERR_VD_BLOCK_FREE;
-                 pCurrImage = pCurrImage->pPrev)
+            while (   pCurrImage->pPrev != NULL
+                   && rc == VERR_VD_BLOCK_FREE)
             {
+                pCurrImage =  pCurrImage->pPrev;
                 rc = pCurrImage->Backend->pfnAsyncRead(pCurrImage->pBackendData,
                                                        uOffset, cbThisRead,
@@ -2990 +2990 @@
     VD_THREAD_IS_CRITSECT_OWNER(pDisk);
 
+    Assert(cbRead > 0);
+
     /* Build the S/G array and spawn a new I/O task */
     while (cbRead)
@@ -2999 +3001 @@
         cbTaskRead = RTSgBufSegArrayCreate(&pIoCtx->SgBuf, aSeg, &cSegments, cbRead);
 
+        Assert(cSegments > 0);
+        Assert(cbTaskRead > 0);
         AssertMsg(cbTaskRead <= cbRead, ("Invalid number of bytes to read\n"));
 
@@ -3058 +3062 @@
     VD_THREAD_IS_CRITSECT_OWNER(pDisk);
 
+    Assert(cbWrite > 0);
+
     /* Build the S/G array and spawn a new I/O task */
     while (cbWrite)
@@ -3067 +3073 @@
         cbTaskWrite = RTSgBufSegArrayCreate(&pIoCtx->SgBuf, aSeg, &cSegments, cbWrite);
 
+        Assert(cSegments > 0);
+        Assert(cbTaskWrite > 0);
         AssertMsg(cbTaskWrite <= cbWrite, ("Invalid number of bytes to write\n"));