Changeset 103528 in vbox

Timestamp:

Feb 22, 2024 11:29:39 AM (9 months ago)

Author:

vboxsync

Message:

Storage/VHD.cpp,VDI.cpp: Build fixes, bugref:3409

Location:

trunk/src/VBox/Storage

Files:

• VDI.cpp (modified) (2 diffs)
• VHD.cpp (modified) (1 diff)

trunk/src/VBox/Storage/VDI.cpp

@@ -1643 +1643 @@
     else if (pImage->paBlocks[uBlock] == VDI_IMAGE_BLOCK_ZERO)
     {
-        size_t cbSet;
-
-        cbSet = vdIfIoIntIoCtxSet(pImage->pIfIo, pIoCtx, 0, cbToRead);
+        size_t cbSet = vdIfIoIntIoCtxSet(pImage->pIfIo, pIoCtx, 0, cbToRead);
         Assert(cbSet == cbToRead); RT_NOREF(cbSet);
     }
@@ -2821 +2819 @@
         {
             unsigned const cbBlock = getImageBlockSize(&pImage->Header);
-            size_t const cbPreAllocated = offDiscard % cbBlock;
+            size_t const cbPreAllocated = offDiscard % RT_MAX(cbBlock, 1); /* MSVC thinks it is clever and says there is a potential mod by 0 here, hence the RT_MAX... */
             size_t const cbPostAllocated = getImageBlockSize(&pImage->Header) - cbDiscard - cbPreAllocated;
             uint8_t *pbBlockData;

trunk/src/VBox/Storage/VHD.cpp

@@ -838 +838 @@
 {
     uint64_t FileSize;
-    VHDFooter vhdFooter;
+    VHDFooter vhdFooter; RT_ZERO(vhdFooter); /* MSVC thinks this can be used uninitialized. */
 
     pImage->uOpenFlags = uOpenFlags;