Changeset 56379 in vbox

Timestamp:

Jun 12, 2015 7:54:38 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100977

Message:

Storage/VMDK: small "just in case" code adjustments, shouldn't be possible to cause harm

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -2895 +2895 @@
     {
         /* Do not delete raw extents, these have full and base names equal. */
-        rc =vmdkFileClose(pImage, &pExtent->pFile,
-                             fDelete
-                          && pExtent->pszFullname
-                          && strcmp(pExtent->pszFullname, pExtent->pszBasename));
+        rc = vmdkFileClose(pImage, &pExtent->pFile,
+                              fDelete
+                           && pExtent->pszFullname
+                           && pExtent->pszBasename
+                           && strcmp(pExtent->pszFullname, pExtent->pszBasename));
     }
     if (pExtent->pszBasename)
@@ -6303 +6304 @@
     AssertPtr(pImage);
 
-    if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-    if (pImage->uOpenFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
-    {
-        rc = VERR_NOT_SUPPORTED;
-        goto out;
-    }
-
     if (pImage)
+    {
+        if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+        {
+            rc = VERR_VD_IMAGE_READ_ONLY;
+            goto out;
+        }
+        if (pImage->uOpenFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
+        {
+            rc = VERR_NOT_SUPPORTED;
+            goto out;
+        }
+
         rc = vmdkSetImageComment(pImage, pszComment);
+    }
     else
         rc = VERR_VD_NOT_OPENED;