Changeset 83320 in vbox

Timestamp:

Mar 19, 2020 9:18:05 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136513

Message:

Guest Control/Main: Resolved another @todo: Do validation of GuestSession::i_copyToGuest() parameters on caller side.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (2 diffs)

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

@@ -796 +796 @@
     LogFlowThisFuncEnter();
 
-    /* Validate stuff. */
-/** @todo r=bird: these validations are better left to the caller.  The first one in particular as there is only one
- * of the four callers which supplies a user specified source set, making an assertion more appropriate and efficient
- * here. */
-    if (RT_UNLIKELY(SourceSet.size() == 0)) /* At least one source must be present. */
-        return setError(E_INVALIDARG, tr("No sources specified"));
-    if (RT_UNLIKELY(SourceSet[0].strSource.isEmpty()))
-        return setError(E_INVALIDARG, tr("First source entry is empty"));
-    if (RT_UNLIKELY(strDestination.isEmpty()))
-        return setError(E_INVALIDARG, tr("No destination specified"));
-
-    /* Create a task and return the progress obejct for it. */
+    /* Create a task and return the progress object for it. */
     GuestSessionTaskCopyTo *pTask = NULL;
     try
@@ -3198 +3187 @@
     }
 
+    /* (Re-)Validate stuff. */
+    if (RT_UNLIKELY(SourceSet.size() == 0)) /* At least one source must be present. */
+        return setError(E_INVALIDARG, tr("No sources specified"));
+    if (RT_UNLIKELY(SourceSet[0].strSource.isEmpty()))
+        return setError(E_INVALIDARG, tr("First source entry is empty"));
+    if (RT_UNLIKELY(aDestination.isEmpty()))
+        return setError(E_INVALIDARG, tr("No destination specified"));
+
     return i_copyToGuest(SourceSet, aDestination, aProgress);
 }