Changeset 8229 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 21, 2008 2:04:57 PM (17 years ago)

Author:

vboxsync

Message:

Opening a monolithic sparse VMDK was lacking the initialization of the per-extent fullname field. Also did some renaming for improving identifier consistency.

File:

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

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -2222 +2222 @@
         pExtent->File = File;
         pImage->File = NIL_RTFILE;
+        pExtent->pszFullname = RTStrDup(pImage->pszFilename);
+        if (!pExtent->pszFullname)
+        {
+            rc = VERR_NO_MEMORY;
+            goto out;
+        }
         rc = vmdkReadMetaSparseExtent(pImage, pExtent);
         if (VBOX_FAILURE(rc))
@@ -2786 +2792 @@
         char *pszBasedirectory = RTStrDup(pImage->pszFilename);
         RTPathStripFilename(pszBasedirectory);
-        char *pszFN;
-        rc = RTStrAPrintf(&pszFN, "%s%c%s", pszBasedirectory, RTPATH_SLASH,
-                          pExtent->pszBasename);
+        char *pszFullname;
+        rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszBasedirectory,
+                          RTPATH_SLASH, pExtent->pszBasename);
         RTStrFree(pszBasedirectory);
         if (VBOX_FAILURE(rc))
             return rc;
-        pExtent->pszFullname = pszFN;
+        pExtent->pszFullname = pszFullname;
 
         /* Create file for extent. */