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

Timestamp:

Apr 15, 2008 7:38:29 AM (17 years ago)

Author:

vboxsync

Message:

VBoxHDD-new: Fix incorrect error handling (causing a crash) and an incorrect assertion triggering the error handling.

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -833 +833 @@
  *
  * @returns VBox status code.
- *          VINF_SUCCESS if a plugin was found. 
+ *          VINF_SUCCESS if a plugin was found.
  *                       ppszFormat contains the string which can be used as backend name.
  *          VERR_NOT_SUPPORTED if no backend was found.
@@ -1190 +1190 @@
     if (VBOX_FAILURE(rc))
     {
-        if (pImage->hPlugin != NIL_RTLDRMOD)
-            RTLdrClose(pImage->hPlugin);
-
         if (pImage)
         {
+            if (pImage->hPlugin != NIL_RTLDRMOD)
+                RTLdrClose(pImage->hPlugin);
+
             if (pImage->pszFilename)
                 RTStrFree(pImage->pszFilename);
@@ -1273 +1273 @@
         /* The LCHS geometry fields may be 0 to leave it to later autodetection. */
         AssertMsgBreak(   VALID_PTR(pLCHSGeometry)
-                       && pLCHSGeometry->cCylinders <= 16383
-                       && pLCHSGeometry->cHeads <= 16
+                       && pLCHSGeometry->cCylinders <= 1024
+                       && pLCHSGeometry->cHeads <= 255
                        && pLCHSGeometry->cSectors <= 63,
                        ("pLCHSGeometry=%#p LCHS=%u/%u/%u\n", pLCHSGeometry,
@@ -1390 +1390 @@
     if (VBOX_FAILURE(rc))
     {
-        if (pImage->hPlugin != NIL_RTLDRMOD)
-            RTLdrClose(pImage->hPlugin);
-
         if (pImage)
         {
+            if (pImage->hPlugin != NIL_RTLDRMOD)
+                RTLdrClose(pImage->hPlugin);
+
             if (pImage->pszFilename)
                 RTStrFree(pImage->pszFilename);
@@ -1821 +1821 @@
                        rc = VERR_INVALID_PARAMETER);
         AssertMsg(pDiskFrom->u32Signature == VBOXHDDDISK_SIGNATURE,
-                  ("u32Signature=%08x\n", pDiskFrom->u32Signature)); 
+                  ("u32Signature=%08x\n", pDiskFrom->u32Signature));
 
         PVDIMAGE pImageFrom = vdGetImageByNumber(pDiskFrom, nImage);
@@ -1828 +1828 @@
                        rc = VERR_INVALID_PARAMETER);
         AssertMsg(pDiskTo->u32Signature == VBOXHDDDISK_SIGNATURE,
-                  ("u32Signature=%08x\n", pDiskTo->u32Signature)); 
+                  ("u32Signature=%08x\n", pDiskTo->u32Signature));
 
         /* If the containers are equal and the backend is the same, rename the image. */
@@ -1899 +1899 @@
             break;
         }
-        
+
         if (cbSize == 0)
             cbSize = cbSizeFrom;
@@ -1907 +1907 @@
         if (VBOX_FAILURE(rc))
             break;
-     
+
         /* @todo Get this from the source image. */
         PDMMEDIAGEOMETRY PCHSGeometryFrom = {0, 0, 0};
         PDMMEDIAGEOMETRY LCHSGeometryFrom = {0, 0, 0};
-        
+
         unsigned uOpenFlagsFrom;
         rc = VDGetOpenFlags(pDiskFrom, nImage, &uOpenFlagsFrom);
@@ -1946 +1946 @@
         uint64_t uOffset = 0;
         uint64_t cbRemaining = cbSize;
-        
+
         do
         {
@@ -2011 +2011 @@
         if (pImageTo->pszFilename)
             RTStrFree(pImageTo->pszFilename);
-        
+
         RTMemFree(pImageTo);
     }