Changeset 76306 in vbox for trunk/src/VBox

Timestamp:

Dec 20, 2018 12:13:23 AM (6 years ago)

Author:

vboxsync

Message:

Runtime/fs/extvfs: Updates, reading data from ext2/ext3 filesystems seems to work to some extent [fixes]

File:

• trunk/src/VBox/Runtime/common/fs/extvfs.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/fs/extvfs.cpp

@@ -1044 +1044 @@
     else
     {
-        uint32_t cEntriesPerBlockMap = pThis->cbBlock << sizeof(uint32_t);
-        uint32_t *paBlockMap = (uint32_t *)RTMemTmpAllocZ(cEntriesPerBlockMap * sizeof(uint32_t));
+        uint32_t cEntriesPerBlockMap = (uint32_t)(pThis->cbBlock >> sizeof(uint32_t));
+        uint32_t *paBlockMap = (uint32_t *)RTMemTmpAllocZ(pThis->cbBlock);
 
         if (!paBlockMap)
@@ -1206 +1206 @@
         else
         {
-            if (off + cbRead <= (uint64_t)pInode->ObjInfo.cbObject)
+            if ((uint64_t)off + cbRead <= (uint64_t)pInode->ObjInfo.cbObject)
                 rc = rtFsExtInode_Read(pThis->pVol, pThis->pInode, (uint64_t)off, pSgBuf->paSegs[0].pvSeg, cbRead, NULL);
             else