Changeset 35243 in vbox

Timestamp:

Dec 20, 2010 1:37:12 PM (14 years ago)

Author:

vboxsync

Message:

Main/GuestCtrlImpl: allow size 0 when copying a file to the guest

File:

• trunk/src/VBox/Main/GuestCtrlImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/GuestCtrlImpl.cpp

@@ -300 +300 @@
                                && !fCompleted)
                         {
-                            vrc = RTFileRead(fileSource, (uint8_t*)aInputData.raw(), RT_MIN(cbToRead, _1M), &cbRead);
-                            /*
-                             * Some other error occured? There might be a chance that RTFileRead
-                             * could not resolve/map the native error code to an IPRT code, so just
-                             * print a generic error.
-                             */
-                            if (RT_FAILURE(vrc))
+                            if (!cbToRead)
+                                cbRead = 0;
+                            else
                             {
-                                rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
-                                                                     Guest::tr("Could not read from file \"%s\" (%Rrc)"),
-                                                                     aTask->strSource.c_str(), vrc);
-                                break;
+                                vrc = RTFileRead(fileSource, (uint8_t*)aInputData.raw(),
+                                                 RT_MIN(cbToRead, _1M), &cbRead);
+                                /*
+                                 * Some other error occured? There might be a chance that RTFileRead
+                                 * could not resolve/map the native error code to an IPRT code, so just
+                                 * print a generic error.
+                                 */
+                                if (RT_FAILURE(vrc))
+                                {
+                                    rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
+                                                                         Guest::tr("Could not read from file \"%s\" (%Rrc)"),
+                                                                         aTask->strSource.c_str(), vrc);
+                                    break;
+                                }
                             }
 
-                            /* Resize buffer to reflect amount we just have read. */
-                            if (cbRead > 0)
-                                aInputData.resize(cbRead);
+                            /* Resize buffer to reflect amount we just have read.
+                             * Size 0 is allowed! */
+                            aInputData.resize(cbRead);
 
                             ULONG uFlags = ProcessInputFlag_None;