Changeset 44940 in vbox for trunk/src/VBox/Storage/QED.cpp

Timestamp:

Mar 6, 2013 10:12:24 PM (12 years ago)

Author:

vboxsync

Message:

Storage/QED,QCOW: Fix backing filename handling (caused crashes and other weird behavior)

File:

• trunk/src/VBox/Storage/QED.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/QED.cpp

@@ -703 +703 @@
 
 /**
- * Converts a given logical offset into the 
+ * Converts a given logical offset into the
  *
  * @returns nothing.
@@ -1150 +1150 @@
 
         if (pImage->pszBackingFilename)
+        {
             RTMemFree(pImage->pszBackingFilename);
+            pImage->pszBackingFilename = NULL;
+        }
 
         qedL2TblCacheDestroy(pImage);
@@ -1218 +1221 @@
                 {
                     /* Load backing filename from image. */
-                    pImage->pszFilename = (char *)RTMemAllocZ(Header.u32BackingFilenameSize + 1); /* +1 for \0 terminator. */
-                    if (pImage->pszFilename)
+                    pImage->pszBackingFilename = (char *)RTMemAllocZ(Header.u32BackingFilenameSize + 1); /* +1 for \0 terminator. */
+                    if (pImage->pszBackingFilename)
                     {
                         pImage->cbBackingFilename  = Header.u32BackingFilenameSize;
@@ -2466 +2469 @@
     AssertPtr(pImage);
     if (pImage)
-        if (pImage->pszFilename)
+        if (pImage->pszBackingFilename)
             *ppszParentFilename = RTStrDup(pImage->pszBackingFilename);
         else