Changeset 103526 in vbox

Timestamp:

Feb 22, 2024 11:19:16 AM (11 months ago)

Author:

vboxsync

Message:

Storage/VHD.cpp: Some unused variable, bugref:3409

File:

• trunk/src/VBox/Storage/VHD.cpp (modified) (6 diffs)

trunk/src/VBox/Storage/VHD.cpp

@@ -428 +428 @@
     }
 
-    if (pvBuf)
-        RTMemTmpFree(pvBuf);
+    RTMemTmpFree(pvBuf);
     return rc;
 }
@@ -756 +755 @@
     rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, uDynamicDiskHeaderOffset,
                                &vhdDynamicDiskHeader, sizeof(VHDDynamicDiskHeader));
+    if (RT_FAILURE(rc))
+        return rc;
+
     if (memcmp(vhdDynamicDiskHeader.Cookie, VHD_DYNAMIC_DISK_HEADER_COOKIE, VHD_DYNAMIC_DISK_HEADER_COOKIE_SIZE))
         return VERR_INVALID_PARAMETER;
@@ -859 +861 @@
 
     rc = vdIfIoIntFileGetSize(pImage->pIfIo, pImage->pStorage, &FileSize);
-    pImage->uCurrentEndOfFile = FileSize - sizeof(VHDFooter);
-
-    rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, pImage->uCurrentEndOfFile,
-                               &vhdFooter, sizeof(VHDFooter));
     if (RT_SUCCESS(rc))
     {
-        if (memcmp(vhdFooter.Cookie, VHD_FOOTER_COOKIE, VHD_FOOTER_COOKIE_SIZE) != 0)
-        {
-            /*
-             * There is also a backup header at the beginning in case the image got corrupted.
-             * Such corrupted images are detected here to let the open handler repair it later.
-             */
-            rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, 0,
-                                       &vhdFooter, sizeof(VHDFooter));
-            if (RT_SUCCESS(rc))
-            {
-                if (memcmp(vhdFooter.Cookie, VHD_FOOTER_COOKIE, VHD_FOOTER_COOKIE_SIZE) != 0)
-                    rc = VERR_VD_VHD_INVALID_HEADER;
-                else
-                    rc = VERR_VD_IMAGE_CORRUPTED;
+        pImage->uCurrentEndOfFile = FileSize - sizeof(VHDFooter);
+
+        rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, pImage->uCurrentEndOfFile,
+                                   &vhdFooter, sizeof(VHDFooter));
+        if (RT_SUCCESS(rc))
+        {
+            if (memcmp(vhdFooter.Cookie, VHD_FOOTER_COOKIE, VHD_FOOTER_COOKIE_SIZE) != 0)
+            {
+                /*
+                 * There is also a backup header at the beginning in case the image got corrupted.
+                 * Such corrupted images are detected here to let the open handler repair it later.
+                 */
+                rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, 0,
+                                           &vhdFooter, sizeof(VHDFooter));
+                if (RT_SUCCESS(rc))
+                {
+                    if (memcmp(vhdFooter.Cookie, VHD_FOOTER_COOKIE, VHD_FOOTER_COOKIE_SIZE) != 0)
+                        rc = VERR_VD_VHD_INVALID_HEADER;
+                    else
+                        rc = VERR_VD_IMAGE_CORRUPTED;
+                }
             }
         }
@@ -2537 +2542 @@
 
         /* Write the new BAT in any case. */
-        rc = vhdFlushImage(pImage);
+        int rc2 = vhdFlushImage(pImage);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
     } while (0);
 
@@ -2839 +2846 @@
                              u32ChkSum, u32ChkSumOld);
             fRepairFooter = true;
-            break;
         }
 
@@ -2897 +2903 @@
                                  u32ChkSum, u32ChkSumOld);
                 fRepairDynHeader = true;
-                break;
             }