Changeset 74824 in vbox for trunk

Timestamp:

Oct 12, 2018 6:47:50 PM (6 years ago)

Author:

vboxsync

Message:

Main: bugref:9152 Implement the convertToStream API [build fix for 32bit hosts]

File:

• trunk/src/VBox/Main/src-server/MediumIOImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MediumIOImpl.cpp

@@ -268 +268 @@
         do
         {
-            size_t cbThisWrite = RT_MIN(pStreamFile->cbFile - pStreamFile->uOffsetLast, sizeof(g_abRTZero64K));
+            size_t cbThisWrite = sizeof(g_abRTZero64K);
             size_t cbWritten = 0;
+
+            if (pStreamFile->cbFile - pStreamFile->uOffsetLast < sizeof(g_abRTZero64K))
+                cbThisWrite = (size_t)(pStreamFile->cbFile - pStreamFile->uOffsetLast);
 
             rc = pStreamFile->pDataStream->i_write(&g_abRTZero64K[0], cbThisWrite, &cbWritten);
@@ -369 +372 @@
         do
         {
-            size_t cbThisWrite = RT_MIN(uOffset - pStreamFile->uOffsetLast, sizeof(g_abRTZero64K));
+            size_t cbThisWrite = sizeof(g_abRTZero64K);
             size_t cbWritten = 0;
+
+            if (uOffset - pStreamFile->uOffsetLast < sizeof(g_abRTZero64K))
+                cbThisWrite = (size_t)(uOffset - pStreamFile->uOffsetLast);
 
             rc = pStreamFile->pDataStream->i_write(&g_abRTZero64K[0], cbThisWrite, &cbWritten);