Changeset 46613 in vbox for trunk/src/VBox/Storage/VDI.cpp

Timestamp:

Jun 18, 2013 10:27:13 AM (11 years ago)

Author:

vboxsync

Message:

Storage: Propagate errors when closing a file but free everything nevertheless (see @bugref{6791})

File:

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

trunk/src/VBox/Storage/VDI.cpp

@@ -225 +225 @@
                 vdiFlushImage(pImage);
 
-            vdIfIoIntFileClose(pImage->pIfIo, pImage->pStorage);
+            rc = vdIfIoIntFileClose(pImage->pIfIo, pImage->pStorage);
             pImage->pStorage = NULL;
         }
@@ -1506 +1506 @@
 
     /* Close the image. */
-    vdiFreeImage(pImage, false);
-
-    /* Rename the file. */
-    rc = vdIfIoIntFileMove(pImage->pIfIo, pImage->pszFilename, pszFilename, 0);
-    if (RT_FAILURE(rc))
-    {
-        /* The move failed, try to reopen the original image. */
-        int rc2 = vdiOpenImage(pImage, pImage->uOpenFlags);
-        if (RT_FAILURE(rc2))
-            rc = rc2;
-
-        goto out;
-    }
-
-    /* Update pImage with the new information. */
-    pImage->pszFilename = pszFilename;
-
-    /* Open the new image. */
-    rc = vdiOpenImage(pImage, pImage->uOpenFlags);
-    if (RT_FAILURE(rc))
-        goto out;
+    rc = vdiFreeImage(pImage, false);
+    if (RT_SUCCESS(rc))
+    {
+        /* Rename the file. */
+        rc = vdIfIoIntFileMove(pImage->pIfIo, pImage->pszFilename, pszFilename, 0);
+        if (RT_FAILURE(rc))
+        {
+            /* The move failed, try to reopen the original image. */
+            int rc2 = vdiOpenImage(pImage, pImage->uOpenFlags);
+            if (RT_FAILURE(rc2))
+                rc = rc2;
+
+            goto out;
+        }
+
+        /* Update pImage with the new information. */
+        pImage->pszFilename = pszFilename;
+
+        /* Open the new image. */
+        rc = vdiOpenImage(pImage, pImage->uOpenFlags);
+        if (RT_FAILURE(rc))
+            goto out;
+    }
 
 out:
@@ -3165 +3167 @@
 
     if (pStorage)
-        vdIfIoIntFileClose(pIfIo, pStorage);
+    {
+        int rc2 = vdIfIoIntFileClose(pIfIo, pStorage);
+        if (RT_SUCCESS(rc))
+            rc = rc2; /* Propagate error code only if repairing was successful. */
+    }
 
     LogFlowFunc(("returns %Rrc\n", rc));