Changeset 103501 in vbox

Timestamp:

Feb 21, 2024 3:43:55 PM (9 months ago)

Author:

vboxsync

Message:

Storage/VDI.cpp: Fix harmless some parfait warnings, bugref:3409

File:

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

trunk/src/VBox/Storage/VDI.cpp

@@ -480 +480 @@
     }
 
-    if (   getImageLCHSGeometry(pHeader)
-        && (getImageLCHSGeometry(pHeader))->cbSector != VDI_GEOMETRY_SECTOR_SIZE)
-    {
-        LogRel(("VDI: wrong sector size (%d != %d)\n",
-               (getImageLCHSGeometry(pHeader))->cbSector, VDI_GEOMETRY_SECTOR_SIZE));
+    PVDIDISKGEOMETRY pLCHSGeom = getImageLCHSGeometry(pHeader);
+    if (   pLCHSGeom
+        && pLCHSGeom->cbSector != VDI_GEOMETRY_SECTOR_SIZE)
+    {
+        LogRel(("VDI: wrong sector size (%d != %d)\n", pLCHSGeom->cbSector, VDI_GEOMETRY_SECTOR_SIZE));
         fFailed = true;
     }
@@ -1513 +1513 @@
     /* Check size. Maximum 4PB-3M. No tricks with adjusting the 1M block size
      * so far, which would extend the size. */
-    if (   !cbSize
-        || cbSize >= _1P * 4 - _1M * 3
+    if (   cbSize >= _1P * 4 - _1M * 3
         || cbSize < VDI_IMAGE_DEFAULT_BLOCK_SIZE
         || (cbSize % 512))
@@ -2563 +2562 @@
     /* Check size. Maximum 4PB-3M. No tricks with adjusting the 1M block size
      * so far, which would extend the size. */
-    if (   !cbSize
-        || cbSize >= _1P * 4 - _1M * 3
+    if (   cbSize >= _1P * 4 - _1M * 3
         || cbSize < VDI_IMAGE_DEFAULT_BLOCK_SIZE)
         return VERR_VD_INVALID_SIZE;