Changeset 33937 in vbox for trunk/src/VBox/Storage

Timestamp:

Nov 10, 2010 3:48:19 PM (14 years ago)

Author:

vboxsync

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

67597

Message:

Storage/VMDK: pvDescriptor might be used uninitialized

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (1 diff)

trunk/src/VBox/Storage/VMDK.cpp

@@ -2576 +2576 @@
         if (RT_FAILURE(rc))
             rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error writing descriptor in '%s'"), pImage->pszFilename);
-    }
-
-    if (RT_SUCCESS(rc) && !cbLimit)
-    {
-        rc = vmdkFileSetSize(pImage, pDescFile, cbDescriptor);
-        if (RT_FAILURE(rc))
-            rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error truncating descriptor in '%s'"), pImage->pszFilename);
-    }
-
-    if (RT_SUCCESS(rc))
-        pImage->Descriptor.fDirty = false;
-
-    RTMemFree(pvDescriptor);
+
+        if (RT_SUCCESS(rc) && !cbLimit)
+        {
+            rc = vmdkFileSetSize(pImage, pDescFile, cbDescriptor);
+            if (RT_FAILURE(rc))
+                rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error truncating descriptor in '%s'"), pImage->pszFilename);
+        }
+
+        if (RT_SUCCESS(rc))
+            pImage->Descriptor.fDirty = false;
+
+        RTMemFree(pvDescriptor);
+    }
+
     return rc;
 }