Changeset 75351 in vbox for trunk/src/VBox/Storage/VD.cpp

Timestamp:

Nov 9, 2018 10:46:06 AM (6 years ago)

Author:

vboxsync

Message:

Storage/VD: Fix error during merge if the target is bigger than the source image [fix]

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -7081 +7081 @@
                          * bigger than the source.
                          */
-                        if (uOffset < pCurrImage->cbImage)
+                        uint64_t cbImage = vdImageGetSize(pCurrImage);
+                        if (uOffset < cbImage)
                         {
-                            cbThisRead = RT_MIN(cbThisRead, pCurrImage->cbImage - uOffset);
+                            cbThisRead = RT_MIN(cbThisRead, cbImage - uOffset);
                             rc = pCurrImage->Backend->pfnRead(pCurrImage->pBackendData,
                                                               uOffset, cbThisRead,
@@ -7218 +7219 @@
                      * bigger than the source.
                      */
-                    if (uOffset < pCurrImage->cbImage)
+                    uint64_t cbImage = vdImageGetSize(pCurrImage);
+                    if (uOffset < cbImage)
                     {
-                        cbThisRead = RT_MIN(cbThisRead, pCurrImage->cbImage - uOffset);
+                        cbThisRead = RT_MIN(cbThisRead, cbImage - uOffset);
                         rc = pCurrImage->Backend->pfnRead(pCurrImage->pBackendData,
                                                           uOffset, cbThisRead,