Changeset 101108 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

Sep 13, 2023 2:20:04 PM (17 months ago)

Author:

vboxsync

Message:

IPRT: Fixing assertions (from r158845) related to VFS pfnRead/pfnWrite operations.

File:

• trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -3616 +3616 @@
     int rc = pThis->pOps->pfnRead(pThis->Base.pvThis, -1 /*off*/, &SgBuf, fBlocking, pcbRead);
     RTVfsLockReleaseWrite(pThis->Base.hLock);
-    Assert(rc != VINF_SUCCESS || RTSgBufIsAtEnd(&SgBuf));
+
+    Assert(   rc != VINF_SUCCESS
+           || RTSgBufIsAtEnd(&SgBuf)
+           || (pcbRead && cbToRead == *pcbRead + RTSgBufCalcLengthLeft(&SgBuf)));
+    Assert(!pcbRead || *pcbRead + RTSgBufCalcLengthLeft(&SgBuf) == cbToRead || RT_FAILURE(rc));
     return rc;
 }
@@ -3640 +3644 @@
     int rc = pThis->pOps->pfnRead(pThis->Base.pvThis, off, &SgBuf, fBlocking, pcbRead);
     RTVfsLockReleaseWrite(pThis->Base.hLock);
-    Assert(rc != VINF_SUCCESS || RTSgBufIsAtEnd(&SgBuf));
+
+    Assert(   rc != VINF_SUCCESS
+           || RTSgBufIsAtEnd(&SgBuf)
+           || (pcbRead && cbToRead == *pcbRead + RTSgBufCalcLengthLeft(&SgBuf)));
+    Assert(!pcbRead || *pcbRead + RTSgBufCalcLengthLeft(&SgBuf) == cbToRead || RT_FAILURE(rc));
     return rc;
 }
@@ -3666 +3674 @@
         rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, -1 /*off*/, &SgBuf, fBlocking, pcbWritten);
         RTVfsLockReleaseWrite(pThis->Base.hLock);
+
         Assert(!pcbWritten || *pcbWritten + RTSgBufCalcLengthLeft(&SgBuf) == cbToWrite || RT_FAILURE(rc));
     }
@@ -3696 +3705 @@
         rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, off, &SgBuf, fBlocking, pcbWritten);
         RTVfsLockReleaseWrite(pThis->Base.hLock);
+
         Assert(!pcbWritten || *pcbWritten + RTSgBufCalcLengthLeft(&SgBuf) == cbToWrite || RT_FAILURE(rc));
     }
@@ -3715 +3725 @@
     AssertReturn(fBlocking || pcbRead, VERR_INVALID_PARAMETER);
     AssertReturn(pThis->fFlags & RTFILE_O_READ, VERR_ACCESS_DENIED);
+#ifdef RT_STRICT
+    size_t const cbToReadAssert = RTSgBufCalcLengthLeft(pSgBuf);
+#endif
 
     RTVfsLockAcquireWrite(pThis->Base.hLock);
@@ -3748 +3761 @@
     }
     RTVfsLockReleaseWrite(pThis->Base.hLock);
-    Assert(rc != VINF_SUCCESS || RTSgBufIsAtEnd(pSgBuf));
+
+    Assert(   rc != VINF_SUCCESS
+           || RTSgBufIsAtEnd(pSgBuf)
+           || (pcbRead && cbToReadAssert == *pcbRead + RTSgBufCalcLengthLeft(pSgBuf)));
+    Assert(!pcbRead || *pcbRead + RTSgBufCalcLengthLeft(pSgBuf) == cbToReadAssert || RT_FAILURE(rc));
     return rc;
 }