Changeset 77227 in vbox

Timestamp:

Feb 8, 2019 5:53:04 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main + FE/Qt: Be more strict for IGuestSession::copyToGuest() / copyFromGuest() and set/validate the filters + flags.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp (modified) (2 diffs)
• Main/src-client/GuestSessionImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -324 +324 @@
 
 void UIFileManagerGuestTable::copyHostToGuest(const QStringList &hostSourcePathList,
-                                        const QString &strDestination /* = QString() */)
+                                              const QString &strDestination /* = QString() */)
 {
     if (!checkGuestSession())
         return;
     QVector<QString> sourcePaths = hostSourcePathList.toVector();
-    QVector<QString>  aFilters;
-    QVector<QString>  aFlags;
+    QVector<QString> aFilters;
+    aFilters.resize(sourcePaths.size()); /* Make sure to match the number of sources, even if empty. */
+    QVector<QString> aFlags;
+    aFlags.resize(sourcePaths.size());   /* Ditto. */
     QString strDestinationPath = strDestination;
     if (strDestinationPath.isEmpty())
@@ -357 +359 @@
         return;
     QVector<QString> sourcePaths = selectedItemPathList().toVector();
-    QVector<QString>  aFilters;
-    QVector<QString>  aFlags;
+    QVector<QString> aFilters;
+    aFilters.resize(sourcePaths.size()); /* Make sure to match the number of sources, even if empty. */
+    QVector<QString> aFlags;
+    aFlags.resize(sourcePaths.size());   /* Ditto. */
 
     if (hostDestinationPath.isEmpty())

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

@@ -2907 +2907 @@
 
     const size_t cSources = aSources.size();
-    if (   (aFilters.size() && aFilters.size() != cSources)
-        || (aFlags.size()   && aFlags.size()   != cSources))
-    {
-        return setError(E_INVALIDARG, tr("Parameter array sizes don't match to the number of sources specified"));
+    if (!cSources)
+        return setError(E_INVALIDARG, tr("No sources specified"));
+
+    if (   (aFilters.size() != cSources)
+        || (aFlags.size()   != cSources))
+    {
+        return setError(E_INVALIDARG, tr("Filter / flag parameter array sizes don't match to the number of sources specified"));
     }
 
@@ -2986 +2989 @@
 
     const size_t cSources = aSources.size();
-    if (   (aFilters.size() && aFilters.size() != cSources)
-        || (aFlags.size()   && aFlags.size()   != cSources))
-    {
-        return setError(E_INVALIDARG, tr("Parameter array sizes don't match to the number of sources specified"));
+    if (!cSources)
+        return setError(E_INVALIDARG, tr("No sources specified"));
+
+    if (   (aFilters.size() != cSources)
+        || (aFlags.size()   != cSources))
+    {
+        return setError(E_INVALIDARG, tr("Filter / flag parameter array sizes don't match to the number of sources specified"));
     }