Changeset 97656 in vbox

Timestamp:

Nov 22, 2022 3:20:34 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Bail out early from the file copy from/to inner methods if the size to copy is 0 (i.e. empty files).

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -398 +398 @@
     RT_NOREF(fFileCopyFlags);
 
-    BOOL fCanceled = FALSE;
+    if (!cbSize) /* Nothing to copy, i.e. empty file? Bail out. */
+        return VINF_SUCCESS;
+
+    BOOL     fCanceled      = FALSE;
     uint64_t cbWrittenTotal = 0;
     uint64_t cbToRead       = cbSize;
@@ -454 +457 @@
             break;
 
-        vrc = setProgress((ULONG)((double)cbWrittenTotal / (double)cbSize / 100.0));
+        AssertBreakStmt(cbSize, vrc = VERR_INTERNAL_ERROR);
+        vrc = setProgress(((double)cbWrittenTotal / (double)cbSize) * 100);
         if (RT_FAILURE(vrc))
             break;
@@ -470 +474 @@
      * everything.
      */
-    if (   cbSize > 0
-        && cbWrittenTotal == 0)
+    if (cbWrittenTotal == 0)
     {
         /* If nothing was transferred but the file size was > 0 then "vbox_cat" wasn't able to write
@@ -728 +731 @@
     RT_NOREF(fFileCopyFlags);
 
-    BOOL fCanceled = FALSE;
+    if (!cbSize) /* Nothing to copy, i.e. empty file? Bail out. */
+        return VINF_SUCCESS;
+
+    BOOL     fCanceled      = FALSE;
     uint64_t cbWrittenTotal = 0;
     uint64_t cbToRead       = cbSize;
@@ -784 +790 @@
             break;
 
-        vrc = setProgress((ULONG)((double)cbWrittenTotal / (double)cbSize / 100.0));
+        AssertBreakStmt(cbSize, vrc = VERR_INTERNAL_ERROR);
+        vrc = setProgress(((double)cbWrittenTotal / (double)cbSize) * 100);
         if (RT_FAILURE(vrc))
             break;
@@ -796 +803 @@
      * everything.
      */
-    if (   cbSize > 0
-        && cbWrittenTotal == 0)
+    if (cbWrittenTotal == 0)
     {
         /* If nothing was transferred but the file size was > 0 then "vbox_cat" wasn't able to write