Changeset 84475 in vbox for trunk/src

Timestamp:

May 23, 2020 5:32:19 PM (5 years ago)

Author:

vboxsync

Message:

VDI: shut up paranoid VCC 14.2 6.6.0 warnings about potential div-by-zero. bugref:8489

File:

• trunk/src/VBox/Storage/VDI.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VDI.cpp

@@ -2568 +2568 @@
     {
         unsigned cBlocksAllocated = getImageBlocksAllocated(&pImage->Header); /** < Blocks currently allocated, doesn't change during resize */
-        uint32_t cBlocksNew = cbSize / getImageBlockSize(&pImage->Header);    /** < New number of blocks in the image after the resize */
-        if (cbSize % getImageBlockSize(&pImage->Header))
+        unsigned const cbBlock = RT_MAX(getImageBlockSize(&pImage->Header), 1);
+        uint32_t cBlocksNew = cbSize / cbBlock;                               /** < New number of blocks in the image after the resize */
+        if (cbSize % cbBlock)
             cBlocksNew++;
 
@@ -2582 +2583 @@
                 /* Calculate how many sectors need to be relocated. */
                 uint64_t cbOverlapping = offStartDataNew - pImage->offStartData;
-                unsigned cBlocksReloc = cbOverlapping / getImageBlockSize(&pImage->Header);
-                if (cbOverlapping % getImageBlockSize(&pImage->Header))
+                unsigned cBlocksReloc = cbOverlapping / cbBlock;
+                if (cbOverlapping % cbBlock)
                     cBlocksReloc++;
 
@@ -2799 +2800 @@
         if (IS_VDI_IMAGE_BLOCK_ALLOCATED(pImage->paBlocks[uBlock]))
         {
+            unsigned const cbBlock = RT_MAX(getImageBlockSize(&pImage->Header), 1);
+            size_t const cbPreAllocated = offDiscard % cbBlock;
+            size_t const cbPostAllocated = getImageBlockSize(&pImage->Header) - cbDiscard - cbPreAllocated;
             uint8_t *pbBlockData;
-            size_t cbPreAllocated, cbPostAllocated;
-
-            cbPreAllocated = offDiscard % getImageBlockSize(&pImage->Header);
-            cbPostAllocated = getImageBlockSize(&pImage->Header) - cbDiscard - cbPreAllocated;
 
             /* Read the block data. */