Changeset 5161 in vbox

Timestamp:

Oct 4, 2007 9:10:22 PM (18 years ago)

Author:

vboxsync

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

25057

Message:

Main: create copy of the format string before freeing it

File:

• trunk/src/VBox/Main/HardDiskImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -4418 +4418 @@
             vrc = VDCreate (pszFormat, VDError, this, &mContainer);
 
+            if (VBOX_SUCCESS(vrc))
+                mFormat = Bstr (pszFormat);
+
             RTStrFree (pszFormat);
 
             /* the format has been already checked for presence at this point */
             ComAssertRCBreak (vrc, rc = E_FAIL);
-
-            mFormat = Bstr (pszFormat);
 
             /* Call queryInformation() anyway (even if it will block), because
@@ -4880 +4881 @@
         Guid id, parentId;
 
-        /// @todo changed from VD_OPEN_FLAGS_READONLY to VD_OPEN_FLAGS_NORMAL,
-        /// because otherwise registering a virtual harddisk which so far has no UUID will
-        /// yield a null UUID. It cannot be added to a custom harddisk opened readonly,
-        /// obviously. This of course changes locking behavior, but for now
-        /// this is acceptable. A better solution needs to be found later.
-        vrc = VDOpen (mContainer, location, VD_OPEN_FLAGS_NORMAL);
+        vrc = VDOpen (mContainer, location, VD_OPEN_FLAGS_INFO);
         if (VBOX_FAILURE (vrc))
             break;