Changeset 20473 in vbox for trunk/src/VBox

Timestamp:

Jun 11, 2009 8:51:01 AM (16 years ago)

Author:

vboxsync

Message:

VHD: Fix crash reported on vbox-dev when discarding snapshots (missing check if a parent filename is actually existing)

File:

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

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

@@ -359 +359 @@
     ddh.ParentTimeStamp = RT_H2BE_U32(pImage->u32ParentTimeStamp);
     /* Update parent's filename. */
-    rc = vhdFilenameToUtf16(RTPathFilename(pImage->pszParentFilename),
-        ddh.ParentUnicodeName, sizeof(ddh.ParentUnicodeName) - 1, NULL);
-    if (RT_FAILURE(rc))
-        return rc;
+    if (pImage->pszParentFilename)
+    {
+        rc = vhdFilenameToUtf16(RTPathFilename(pImage->pszParentFilename),
+             ddh.ParentUnicodeName, sizeof(ddh.ParentUnicodeName) - 1, NULL);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
     /* Update parent's locators. */
     for (i = 0; i < VHD_MAX_LOCATOR_ENTRIES; i++)